From: minima <minima>
Date: Sat, 28 Apr 2001 21:37:21 +0000 (+0000)
Subject: show the correct call on 'connected on other node' messages
X-Git-Tag: R_1_47~4
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=ff03e18639d468fc7f5a9c958b16ab45406fb5d2;p=spider.git

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

diff --git a/perl/Messages b/perl/Messages
index 642fc542..573857ab 100644
--- 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 230cd88e..9c7557bf 100755
--- 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;
 		}