X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=a5aaa5cfebd1f122c1b68b274d166e3c613774bf;hb=17f0b57add792391822d38116e89b33c1df4e2dd;hp=18367bdfa76982c2b207cdc27b77b5bf1f75ba83;hpb=72568e838d146250a78fea19bd4bbafc760e6a49;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 18367bdf..a5aaa5cf 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -705,10 +705,10 @@ sub announce
 	my $text = shift;
 	my ($filter, $hops);
 
-	if ($suppress_ann_to_talk) {
-		my ($to, $call) = $text =~ /^\s*([\w-]+)[\s:]+([\w-]+)/;
-		return if ($to && $call && ((uc $to eq 'TO' && is_callsign(uc $call)) || is_callsign($call = uc $to)));
-	}	
+	if ($suppress_ann_to_talk && $to ne $self->{call}) {
+		my $call = AnnTalk::is_talk_candidate($_[0], $text);
+		return if $call && Route::get($call);
+	}
 
 	if ($self->{annfilter}) {
 		($filter, $hops) = $self->{annfilter}->it(@_ );