fixed merge command

diff --git a/Changes b/Changes
index 824457049172dfb729473276db410bec4eed89af..68be427915f2ba81d3901b1852b897befe8c168a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+29Jun99=======================================================================
+1. fixed merge command that I broke.
 28Jun99=======================================================================
 1. console.pl now works with history and editting.
 2. added scrolling to stuff sent by the cluster.

diff --git a/cmd/merge.pl b/cmd/merge.pl
index a4370e082e5f9eecf8028a70268c7b4a6a08bd04..c5f31f5afab87e1744cca6b6cec687439dcff200 100644 (file)
--- a/cmd/merge.pl
+++ b/cmd/merge.pl
@@ -8,13 +8,13 @@
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
+my $call = uc $f[0];
 
 # check for callsign
 return (1, $self->msg('e5')) if $self->priv < 5;
 return (1, $self->msg('e12')) if !$f[0];
 return (1, $self->msg('e11')) if $call eq $main::mycall;
 
-my $call = uc $f[0];
 my $ref = DXCluster->get_exact($call);
 my $dxchan = $ref->dxchan if $ref;
 return (1, $self->msg('e10', $call)) unless $ref;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1af0388a3449ed82a9bfdeb7a370f4579505e3a8..51e8aed7b386cd9ced159f7ac8d1408e9bb6c019 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -67,7 +67,7 @@ package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.30";                             # the version no of the software
+$version = "1.31";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
       

diff --git a/perl/console.pl b/perl/console.pl
index 977285dad1e1db43d60f215a7ee7d67c38c3c906..14c945a58987edabecd084078caf58eedca9ed38 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -252,8 +252,11 @@ sub rec_stdin
                        $pos++;
                        $lth++;
                } elsif ($r eq "\014" || $r eq "\022") {
+                       $top->touchwin();
+                       $bot->touchwin();
                        $scr->touchwin();
                        $scr->refresh();
+                       $top->refresh();
                } elsif ($r eq "\013") {
                        $inbuf = substr($inbuf, 0, $pos);
                        $lth = length $inbuf;