resolve conflict

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6f4b089dd1841835bedd320f8b0b979e0c98a5b6..42eb6b86731395c8a7f7bc108016b225f41a44d2 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -358,6 +358,10 @@ sub normal
                        # do some de-duping
                        $field[5] =~ s/^\s+//;      # take any leading blanks off
                        $field[2] = unpad($field[2]);   # take off leading and trailing blanks from spotted callsign
+                       if ($field[2] =~ /BUST\w*$/) {
+                               dbg('chan', "PCPROT: useless 'BUSTED' spot");
+                               return;
+                       }
                        if (Spot::dup($field[1], $field[2], $d, $field[5])) {
                                dbg('chan', "PCPROT: Duplicate Spot ignored\n");
                                return;
@@ -597,7 +601,7 @@ sub normal
                                dbg('chan', "PCPROT: $field[2] came in on wrong channel");
                                return;
                        }
-                       if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
+                       if ($dxchan = DXChannel->get($field[1])) {
                                dbg('chan', "PCPROT: $field[1] connected locally");
                                return;
                        }