X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=0bde0d2cd010623bc34dfd551989a45336369b61;hb=cc91428ca79b3cdfdc7733505384f5983ad6c7fa;hp=5bda044a045644a3a8687c2ff4e36828c9958bec;hpb=28ad9d9ee88ce029286e9dabe6ee9de40f8f0ae5;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 5bda044a..0bde0d2c 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -116,8 +116,9 @@ sub start
 	$self->{wwvfilter} = Filter::read_in('wwv', $call);
 	$self->{annfilter} = Filter::read_in('ann', $call);
 	
-	# set unbuffered
+	# set unbuffered and no echo
 	$self->send_now('B',"0");
+	$self->send_now('E',"0");
 	
 	# send initialisation string
 	if (!$self->{outbound}) {
@@ -735,10 +736,14 @@ sub send_dx_spot
 				$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
 				
 			}
-		} elsif ($dxchan->is_user) {
+		} elsif ($dxchan->is_user && $dxchan->{dx}) {
 			my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
-			$buf .= "\a\a" if $dxchan->beep;
-			$dxchan->send($buf) if !$hops || ($hops && $filter);
+			$buf .= "\a\a" if $dxchan->{beep};
+			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+				$dxchan->send($buf) if !$hops || ($hops && $filter);
+			} else {
+				$dxchan->delay($buf) if !$hops || ($hops && $filter);
+			}
 		}					
 	}
 }