fiddle about with 'bye'

diff --git a/cmd/bye.pl b/cmd/bye.pl
index d6e2d14becc76790295e429a02a093bb15653f54..13195c60ebb3a38820c8f9f77e0e3de841746025 100644 (file)
--- a/cmd/bye.pl
+++ b/cmd/bye.pl
@@ -15,5 +15,6 @@ if ($self->is_user && -e "$main::data/logout") {
        sleep(1);
 }
 
-$self->state('bye');
+$self->disconnect;
+
 return (1);

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 58b4296934c5a5ae0c6d44d81a5394ea01d9401c..c03885526a9ed96664d31f75e31a7995eac48bf8 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -288,6 +288,7 @@ sub normal
                }
                if ($@) {
                        $self->send_ans("Syserr: on stored func $self->{func}", $@);
+                       delete $self->{func};
                        $self->state('prompt');
                        undef $@;
                }

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 16458073b837bf7005718fac05fe2b66e5af7aa6..b7ac117773e9f398f8a777e6d21abd56cd0d4e7e 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -311,7 +311,6 @@ sub process_inqueue
                        die "\$user not defined for $call" if !defined $user;
                        # normal input
                        $dxchan->normal($line);
-                       $dxchan->disconnect if ($dxchan->{state} eq 'bye');
                } elsif ($sort eq 'Z') {
                        $dxchan->disconnect;
                } elsif ($sort eq 'D') {