diff --git a/CWSST.pas b/CWSST.pas index f06ca2e..a04ddbf 100644 --- a/CWSST.pas +++ b/CWSST.pas @@ -297,7 +297,8 @@ function TCWSST.GetStationInfo(const ACallsign: string) : string; // return userText. If empty, return DXCC Continent/Entity info. userText := cwopsrec.UserText; if userText.IsEmpty and - gDXCCList.FindRec(dxrec, ACallsign) then + gDXCCList.FindRec(dxrec, ACallsign) and + (dxrec.Entity <> Me.MyEntity) then userText := dxRec.Continent + '/' + dxRec.Entity; if not userText.IsEmpty then diff --git a/MyStn.pas b/MyStn.pas index 5cc4c29..8ce59fd 100644 --- a/MyStn.pas +++ b/MyStn.pas @@ -17,6 +17,7 @@ TMyStation = class(TStation) procedure AddToPieces(AMsg: string); procedure SendNextPiece; public + MyEntity : String; constructor CreateStation; destructor Destroy; override; procedure Init; @@ -32,7 +33,7 @@ TMyStation = class(TStation) implementation uses - SysUtils, RndFunc, Ini, MorseKey, Contest, Main; + SysUtils, RndFunc, Ini, MorseKey, Contest, Main, ARRL; { TMyStation } @@ -52,9 +53,13 @@ destructor TMyStation.Destroy; procedure TMyStation.Init; +var + dxrec : TDXCCRec; begin inherited Init; + dxrec := nil; + MyCall := Ini.Call; NR := 1; RST := 599; @@ -71,6 +76,11 @@ procedure TMyStation.Init; OpName := HamName; Exch1 := '3A'; Exch2 := 'OR'; + + // load my Entity string; used to filter user-text status messages + MyEntity := ''; + if gDXCCList.FindRec(dxrec, MyCall) then + MyEntity := dxrec.Entity; end;