X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=16a03037af07781172635925a2b88124c51098d7;hb=c66d28ace3e5bf4b9fa20256425d7d1416e7d8c5;hp=b7bdd0373d90ea74eec08e10320b3a14584fecb3;hpb=cce161221036760959ff1d0b7628a55942bf558a;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b7bdd037..16a03037 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -89,19 +89,17 @@ sub rec
 		# is there one already connected elsewhere in the cluster (and not a cluster)
 		my $user = DXUser->get($call);
 		if ($user) {
-			if ($user->sort eq 'A' && !DXCluster->get_exact($call)) {
-				;
-			} elsif ($user->sort eq 'U' && $call eq $main::myalias && !DXCluster->get_exact($call)) {
+			if (($user->sort eq 'A' || $call == $myalias) && !DXCluster->get_exact($call)) {
 				;
 			} else {
-				if (DXChannel->get($call)) {
+				if (DXCluster->get($call) || DXChannel->get($call)) {
 					my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
 					already_conn($conn, $call, $mess);
 					return;
 				}
 			}
 		} else {
-			if (DXChannel->get($call)) {
+			if (DXCluster->get($call) || DXChannel->get($call)) {
 				my $mess = DXM::msg($lang, 'conother', $call);
 				already_conn($conn, $call, $mess);
 				return;