From b735ad9a0325fae9ca0c2324794b99288a737802 Mon Sep 17 00:00:00 2001
From: minima <minima>
Date: Wed, 7 Nov 2001 17:00:28 +0000
Subject: [PATCH] fiddle about with 'bye'

---
 cmd/bye.pl            | 3 ++-
 perl/DXCommandmode.pm | 1 +
 perl/cluster.pl       | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/bye.pl b/cmd/bye.pl
index d6e2d14b..13195c60 100644
--- 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 58b42969..c0388552 100644
--- 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 16458073..b7ac1177 100755
--- 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') {
-- 
2.34.1