show the correct call on 'connected on other node' messages

diff --git a/perl/Messages b/perl/Messages
index 642fc5426c92fd84de89d76ea5389b466545e13c..573857ab59bc089fab44dffce13a5e535ba071f9 100644 (file)
--- a/perl/Messages
+++ b/perl/Messages
@@ -23,7 +23,7 @@ package DXM;
                                beepon => 'Beeps are now on',
                                call1 => 'Callsign lookup via $_[0]:',
                                conother => 'Sorry $_[0] you are connected to me on another port',
-                               concluster => 'Sorry $_[0] you are already connected elsewhere on the cluster (on $_[0])',
+                               concluster => 'Sorry $_[0] you are already connected elsewhere on the cluster (on $_[1])',
                                conscript => 'no connect script called \"$_[0]\" found in $main::root/connect',
                                confail => 'connection to $_[0] failed ($_[1])',
                                constart => 'connection to $_[0] started',

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 230cd88e6ec7c35006a524f61e311d5f509fe720..9c7557bf4fb02b79a8ae974187a31bcdc7099555 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -147,7 +147,7 @@ sub new_channel
                        ;
                } else {
                        if (my $ref = DXCluster->get_exact($call)) {
-                               my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+                               my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
                                already_conn($conn, $call, $mess);
                                return;
                        }
@@ -155,7 +155,7 @@ sub new_channel
                $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
        } else {
                if (my $ref = DXCluster->get_exact($call)) {
-                       my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+                       my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
                        already_conn($conn, $call, $mess);
                        return;
                }