allow 't <call>' for swopping from announces as well

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ca6e4728466d2febcb7f12639235f38c30373632..153618f9dc182f6a33bd1ee238130f121eef7bde 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -522,10 +522,13 @@ sub normal
                                if ($ann_to_talk) {
                                        my ($to, $call) = $field[3] =~ /^\s*([\w-]+)[\s:]+([\w-]+)/;
                                        if ($to && $call) {
-                                               if ((uc $to eq 'TO' && is_callsign(uc $call)) || is_callsign($call = uc $to)) {
+                                               $to = uc $to;
+                                               $call = uc $call;
+                                               if (($to =~ /^TO?$/ && is_callsign($call)) || is_callsign($call = $to)) {
                                                        my $ref = Route::get($call);
                                                        if ($ref) {
-                                                               $ref->dxchan->talk($field[1], $call, undef, $field[3], $field[5]);
+                                                               my $dxchan = $ref->dxchan;
+                                                               $dxchan->talk($field[1], $call, undef, $field[3], $field[5]) if $dxchan != $self;
                                                                return;
                                                        }
                                                }