X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXCommandmode.pm;h=a8418bd4daf0af368947b188f8c30a534279f26d;hb=50f6466ca2dff82ca470a4abe327d741cffef61a;hp=c2cab9f9bb619dc02ed6831ae9a1401b85f006af;hpb=1cc51a6696899a05d1b9ca40dab497cfdc39294b;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index c2cab9f9..a8418bd4 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -61,7 +61,7 @@ sub new
 	my $pkg = shift;
 	my $call = shift;
 	my @rout = $main::routeroot->add_user($call, Route::here(1));
-	DXProt::route_pc16($DXProt::me, $main::routeroot, @rout) if @rout;
+	DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
 
 	return $self;
 }
@@ -120,16 +120,6 @@ sub start
 		$user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);  
 	}
 
-	# send prompts and things
-	my $info = Route::cluster();
-	$self->send("Cluster:$info");
-	$self->send($self->msg('namee1')) if !$user->name;
-	$self->send($self->msg('qthe1')) if !$user->qth;
-	$self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
-	$self->send($self->msg('hnodee1')) if !$user->qth;
-	$self->send($self->msg('m9')) if DXMsg::for_me($call);
-	$self->prompt;
-
 	# decide on echo
 	if (!$user->wantecho) {
 		$self->send_now('E', "0");
@@ -142,13 +132,25 @@ sub start
 	my $lastoper = $user->lastoper || 0;
 	my $homenode = $user->homenode || ""; 
 	if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
-		run_cmd($DXProt::me, "forward/opernam $call");
+		run_cmd($main::me, "forward/opernam $call");
 		$user->lastoper($main::systime);
 	}
 
 	# run a script send the output to the punter
 	my $script = new Script(lc $call) || new Script('user_default');
 	$script->run($self) if $script;
+
+	# send cluster info
+	my $info = Route::cluster();
+	$self->send("Cluster:$info");
+
+	# send prompts and things
+	$self->send($self->msg('namee1')) if !$user->name;
+	$self->send($self->msg('qthe1')) if !$user->qth;
+	$self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
+	$self->send($self->msg('hnodee1')) if !$user->qth;
+	$self->send($self->msg('m9')) if DXMsg::for_me($call);
+	$self->prompt;
 }
 
 #
@@ -449,7 +451,7 @@ sub disconnect
 	}
 
 	# issue a pc17 to everybody interested
-	DXProt::route_pc17($DXProt::me, $main::routeroot, @rout) if @rout;
+	DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
 
 	# I was the last node visited
     $self->user->node($main::mycall);