X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXCommandmode.pm;h=791256dc7090a45b864e1c1ca230565d43d207ee;hb=c32da9acc192ee726e1fad7425990a37ce7eb27f;hp=58b4296934c5a5ae0c6d44d81a5394ea01d9401c;hpb=b672afe940f843351af2bc4a87b4c4239f3a5140;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 58b42969..791256dc 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -288,6 +288,7 @@ sub normal
 		}
 		if ($@) {
 			$self->send_ans("Syserr: on stored func $self->{func}", $@);
+			delete $self->{func};
 			$self->state('prompt');
 			undef $@;
 		}
@@ -785,7 +786,13 @@ sub dx_spot
 		return unless $filter;
 	}
 
-	my $buf = Spot::formatb($self->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
+
+	my $t = ztime($_[2]);
+	my $ref = DXUser->get_current($_[4]);
+	my $loc = $ref->qra if $ref && $ref->qra && $self->{user}->wantgrid;
+	$loc = ' ' . substr($loc, 0, 4) if $loc;
+	$loc = "" unless $loc;
+	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-*s $t$loc", "$_[4]:", $_[0], $_[1], $self->{consort} eq 'local' ? 29 : 30, $_[3];
 	$buf .= "\a\a" if $self->{beep};
 	$buf =~ s/\%5E/^/g;
 	$self->local_send('X', $buf);