X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=2c49fabe07cb7422ef8536efb981a5fce5c980c5;hb=378cbf24f1b918e78d8b93c9e7ce3cf46fe28ec7;hp=510adac255f8a7caa397d1f88daf866f2057569d;hpb=d3568fec5fb3e19f72dc4813dd2e18a7031dd6bb;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 510adac2..2c49fabe 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -1030,41 +1030,45 @@ sub format_dx_spot
 	$c =~ s/\t/ /g;
 	my $comment = substr (($c || ''), 0, $clth);
 	$comment .= ' ' x ($clth - (length($comment)));
-	
-    if (!$slot1 && $self->{user}->wantgrid) {
-		my $ref = DXUser::get_current($_[1]);
-		if ($ref && $ref->qra) {
-			$slot1 = ' ' . substr($ref->qra, 0, 4);
+
+	if ($self->{user}) {		# to allow the standalone program 'showdx' to work
+		if (!$slot1 && $self->{user}->wantgrid) {
+			my $ref = DXUser::get_current($_[1]);
+			if ($ref && $ref->qra) {
+				$slot1 = ' ' . substr($ref->qra, 0, 4);
+			}
 		}
-	}
-	if (!$slot1 && $self->{user}->wantusstate) {
-		$slot1 = " $_[12]" if $_[12];
-	}
-	unless ($slot1) {
-		if ($self->{user}->wantdxitu) {
-			$slot1 = sprintf(" %2d", $_[8]) if defined $_[8]; 
-		} elsif ($self->{user}->wantdxcq) {
-			$slot1 = sprintf(" %2d", $_[9]) if defined $_[9];
+		if (!$slot1 && $self->{user}->wantusstate) {
+			$slot1 = " $_[12]" if $_[12];
 		}
-	}
-	$comment = substr($comment, 0,  $clth-length($slot1)) . $slot1 if $slot1;
+		unless ($slot1) {
+			if ($self->{user}->wantdxitu) {
+				$slot1 = sprintf(" %2d", $_[8]) if defined $_[8]; 
+			}
+			elsif ($self->{user}->wantdxcq) {
+				$slot1 = sprintf(" %2d", $_[9]) if defined $_[9];
+			}
+		}
+		$comment = substr($comment, 0,  $clth-length($slot1)) . $slot1 if $slot1;
 	
-    if (!$slot2 && $self->{user}->wantgrid) {
-		my $origin = $_[4];
-		$origin =~ s/-#$//;			# sigh......
-		my $ref = DXUser::get_current($origin);
-		if ($ref && $ref->qra) {
-			$slot2 = ' ' . substr($ref->qra, 0, 4);
+		if (!$slot2 && $self->{user}->wantgrid) {
+			my $origin = $_[4];
+			$origin =~ s/-#$//;	# sigh......
+			my $ref = DXUser::get_current($origin);
+			if ($ref && $ref->qra) {
+				$slot2 = ' ' . substr($ref->qra, 0, 4);
+			}
 		}
-	}
-	if (!$slot2 && $self->{user}->wantusstate) {
-		$slot2 = " $_[13]" if $_[13];
-	}
-	unless ($slot2) {
-		if ($self->{user}->wantdxitu) {
-			$slot2 = sprintf(" %2d", $_[10]) if defined $_[10]; 
-		} elsif ($self->{user}->wantdxcq) {
-			$slot2 = sprintf(" %2d", $_[11]) if defined $_[11]; 
+		if (!$slot2 && $self->{user}->wantusstate) {
+			$slot2 = " $_[13]" if $_[13];
+		}
+		unless ($slot2) {
+			if ($self->{user}->wantdxitu) {
+				$slot2 = sprintf(" %2d", $_[10]) if defined $_[10]; 
+			}
+			elsif ($self->{user}->wantdxcq) {
+				$slot2 = sprintf(" %2d", $_[11]) if defined $_[11]; 
+			}
 		}
 	}