[cl-irc-cvs] CVS cl-irc

[ehuelsmann]

Update of /project/cl-irc/cvsroot/cl-irc
In directory common-lisp:/tmp/cvs-serv379

Modified Files:
	event.lisp 
Log Message:
Verify there actually *is* a user to remove.

--- /project/cl-irc/cvsroot/cl-irc/event.lisp	2006/02/20 17:27:57	1.22
+++ /project/cl-irc/cvsroot/cl-irc/event.lisp	2006/02/22 18:54:18	1.23
@@ -1,4 +1,4 @@
-;;;; $Id: event.lisp,v 1.22 2006/02/20 17:27:57 ehuelsmann Exp $
+;;;; $Id: event.lisp,v 1.23 2006/02/22 18:54:18 ehuelsmann Exp $
 ;;;; $Source: /project/cl-irc/cvsroot/cl-irc/event.lisp,v $
 
 ;;;; See LICENSE for licensing information.
@@ -207,9 +207,10 @@
         arguments
       (let ((channel (find-channel connection channel))
             (user (find-user connection source)))
-        (if (self-message-p message)
-            (remove-channel user channel)
-          (remove-user channel user))))))
+        (when (and user channel)
+          (if (self-message-p message)
+              (remove-channel user channel)
+            (remove-user channel user)))))))
 
 (defmethod default-hook ((message irc-quit-message))
   (let* ((connection (connection message))
@@ -283,9 +284,10 @@
       (declare (ignore arguments))
       (let* ((channel (find-channel connection channel))
              (user (find-user connection nick)))
-        (if (self-message-p message)
-            (remove-channel user channel)
-          (remove-user channel user))))))
+        (when (and user channel)
+          (if (self-message-p message)
+              (remove-channel user channel)
+            (remove-user channel user)))))))
 
 (defmethod default-hook ((message ctcp-time-message))
   (multiple-value-bind