* riece-server.el (riece-quit-server-process): Call

[riece] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index ba66fce..89e9237 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -148,13 +148,13 @@ the `riece-server-keyword-map' variable."
       (if (equal server-name "")
          (message "Logging in to IRC server...")
        (message "Logging in to %s..." server-name))
-      (if (or password
-             riece-reconnect-with-password)
+      (if riece-reconnect-with-password        ;password incorrect or not set.
+         (unwind-protect
+             (setq password (riece-read-passwd "Password: "))
+           (setq riece-reconnect-with-password nil)))
+      (if password
          (riece-process-send-string process
-                                    (format "PASS %s\r\n"
-                                            (or password
-                                                (riece-read-passwd
-                                                 "Password: ")))))
+                                    (format "PASS %s\r\n" password)))
       (riece-process-send-string process
                                 (format "USER %s * * :%s\r\n"
                                         (user-real-login-name)
@@ -211,7 +211,7 @@ the `riece-server-keyword-map' variable."
   (run-at-time riece-quit-timeout nil
               (lambda (process)
                 (if (memq process riece-process-list)
-                    (kill-process (process-buffer process))))
+                    (riece-close-server-process process)))
               process)
   (riece-process-send-string process
                             (if message