From: minima Date: Fri, 14 Sep 2001 23:43:31 +0000 (+0000) Subject: re-order the prompts and stuff X-Git-Tag: R_1_48~1 X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=a8d4234c702d3cf6049a9e53bd07cfc924eaee25 re-order the prompts and stuff --- diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 4142f043..9f3c669e 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -120,15 +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); - # decide on echo if (!$user->wantecho) { $self->send_now('E', "0"); @@ -149,6 +140,16 @@ sub start 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; }