* serv_chat.c: allow a session to be killed while in chat

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 36f326eca7dcfbb09b1a9058cf35af457851502f..d6bc5d35fd10ed82e0dcba2667547180c5da468c 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 590.39  2002/01/05 12:44:43  error
+ * serv_chat.c: allow a session to be killed while in chat
+
  Revision 590.38  2002/01/05 12:31:04  error
  * user_ops.c: become_session() when calling EVT_LOGOUT session hooks
 
@@ -3077,4 +3080,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
 
-

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 396455e26ea8b2afef715ba6b17416e892cc50b7..9fdec0562853e72d30aafc5bc20dca1781ece9a8 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -265,7 +265,7 @@ void cmd_chat(char *argbuf)
 
                retval = client_read_to(&cmdbuf[linelen], 1, 2);
 
-               if (retval < 0) {       /* socket broken? */
+               if (retval < 0 || CC->kill_me) {        /* socket broken? */
                        if ((CC->cs_flags & CS_STEALTH) == 0) {
                                allwrite("<disconnected>", 0, NULL);
                        }