1. added wantgrid (to control display of grid square info on DX Broadcasts)

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 0a1c83ddbce0278dbac19abfa5fc76d4678096c0..532322d0f506f6731988ddc695a68ef25d11e174 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -247,7 +247,7 @@ sub normal
                        my $user = DXUser->get_current($spot[4]);
                        if ($user) {
                                my $qra = $user->qra;
-                               if (!DXBearing::is_qra) {
+                               unless ($qra && DXBearing::is_qra($qra)) {
                                        my $lat = $user->lat;
                                        my $long = $user->long;
                                        if (defined $lat && defined $long) {
@@ -957,7 +957,7 @@ sub send_dx_spot
                                $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
                        }
                } elsif ($dxchan->is_user && $dxchan->{dx}) {
-                       my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
+                       my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
                        $buf .= "\a\a" if $dxchan->{beep};
                        if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
                                $dxchan->send($buf);