5. fix talkmode so that it only does 'via' PC10s when it really needs to.

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 9cdd1c58bde99deeca39e9a488dd3194e24b9345..1f6d155158dc7e3e48437bb0b553fe2cdefe32ca 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -12,6 +12,7 @@ my $via;
 my $line;
 my $from = $self->call;
 my @out;
+return (1, $self->msg('e5')) if $self->remotecmd;
 
 # analyse the line there are four situations...
 # 1) talk call
@@ -39,7 +40,8 @@ return (1, $self->msg('e7', $call)) unless $dxchan;
 if ($line) {
        $dxchan->talk($self->call, $to, $via, $line) if $dxchan;
 } else {
-       my $s = "$to>" . $dxchan->call;
+       my $s = $to;
+       $s .= ">$via" if $via;
        my $ref = $self->talklist;
        if ($ref) {
                unless (grep { $_ eq $s } @$ref) {