From: kaoru <kaoru>
Date: Sun, 30 Jan 2005 07:29:52 +0000 (+0000)
Subject: * riece-display.el (riece-display-connect-signals): Check nick or
X-Git-Tag: riece-1_0_7~77
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=180e55dea00043b9325e6e375c3fd743d7027b91;p=elisp%2Friece.git

* riece-display.el (riece-display-connect-signals): Check nick or
channel, before call `riece-channel-get-users'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9caaf6..7d6680e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-30  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* riece-display.el (riece-display-connect-signals): Check nick or
+	channel, before call `riece-channel-get-users'.
+
 2004-12-15  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* riece-addon.el (riece-command-enable-addon): Fixed.
diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 82af80f..5a16cdf 100644
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -125,11 +125,13 @@ Local to the buffer in `riece-buffer-list'.")
 		 (riece-identity-server riece-current-channel))
 	  (riece-with-server-buffer (riece-identity-server
 				     riece-current-channel)
-	    (riece-identity-assoc
-	     (riece-identity-prefix (nth 1 (riece-signal-args signal)))
-	     (riece-channel-get-users (riece-identity-prefix
-				       riece-current-channel))
-	     t)))))
+	    (when (riece-channel-p (riece-identity-prefix
+				    riece-current-channel))
+	      (riece-identity-assoc
+	       (riece-identity-prefix (nth 1 (riece-signal-args signal)))
+	       (riece-channel-get-users (riece-identity-prefix
+					 riece-current-channel))
+	       t))))))
   (riece-connect-signal
    'user-renamed
    (lambda (signal handback)