From: minima <minima>
Date: Sat, 8 Mar 2003 10:13:08 +0000 (+0000)
Subject: fix order
X-Git-Tag: PRE-1-52~34
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=8aa19bb5e21bbbea68b6610e3f4c52f5835b209e;p=spider.git

fix order
---

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 1b361d06..6bb1aecf 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -607,7 +607,9 @@ sub handle_12
 
 	my $dxchan;
 	
-	if ($_[2] eq '*' || $_[2] eq $main::mycall) {
+	if ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w]+$/){
+		$self->send_chat($line, @_[1..6]);
+	} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
 
 
 		# here's a bit of fun, convert incoming ann with a callsign in the first word
@@ -626,8 +628,6 @@ sub handle_12
 	
 		# send it
 		$self->send_announce($line, @_[1..6]);
-	} elsif ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w]+$/){
-		$self->send_chat($line, @_[1..6]);
 	} else {
 		$self->route($_[2], $line);
 	}