X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=5211b7aa622ec6553084b3371925bd0919d8405a;hb=3ac88c21abe28b60bd5b26a8dae2474ad3e81f8a;hp=b8ac3ead62ddc313c35edf2ef04fb91d220ffba2;hpb=1edb247cb81f40501124306d965aed2aebaa191a;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b8ac3ead..5211b7aa 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -210,7 +210,7 @@ sub normal
 			
 			# store it away
 			my $spotter = $field[6];
-			$spotter =~ s/-\d+$//o;	# strip off the ssid from the spotter
+			$spotter =~ s/-[\@\d]+$//o;	# strip off the ssid from the spotter
 			
 			# do some de-duping
 			my $freq = $field[1] - 0;
@@ -812,7 +812,13 @@ sub send_dx_spot
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
 		my $routeit;
-		my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} ) if $dxchan->{spotfilter};
+		my ($filter, $hops);
+
+		if ($dxchan->{spotfilter}) {
+		    ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} );
+			next unless $filter;
+		}
+		
 		if ($dxchan->is_ak1a) {
 			next if $dxchan == $self;
 			if ($hops) {