X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-server.el;h=2b18ba15461a81e9cdc3e2a23a536c43cee974ae;hp=b4b1729bb2ea8ea267fca3cfb20d4257e7c43f38;hb=8578d51ae0b432dce4534ba2e0ff58002df25378;hpb=9f9d9d361effbeb34ec1d3c1152e1949f609e00d

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index b4b1729..2b18ba1 100644
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -193,16 +193,11 @@ the `riece-server-keyword-map' variable."
     (buffer-disable-undo)
     (erase-buffer)))
 
-(eval-when-compile
-  (autoload 'riece-exit "riece"))
 (defun riece-close-server-process (process)
   (if riece-debug
       (delete-process process)
     (kill-buffer (process-buffer process)))
-  (setq riece-process-list (delq process riece-process-list))
-  ;; If no server process is available, exit.
-  (unless riece-process-list
-    (riece-exit)))
+  (setq riece-process-list (delq process riece-process-list)))
 
 (defun riece-server-opened (&optional server-name)
   (let ((process-list riece-process-list))
@@ -212,11 +207,16 @@ the `riece-server-keyword-map' variable."
 	    (throw 'found t))
 	(setq process-list (cdr process-list))))))
 
+(eval-when-compile
+  (autoload 'riece-exit "riece"))
 (defun riece-quit-server-process (process &optional message)
   (run-at-time riece-quit-timeout nil
 	       (lambda (process)
-		 (if (memq process riece-process-list)
-		     (riece-close-server-process process)))
+		 (when (memq process riece-process-list)
+		   (riece-close-server-process process)
+		   ;; If no server process is available, exit.
+		   (unless riece-process-list
+		     (riece-exit))))
 	       process)
   (riece-process-send-string process
 			     (if message