X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-server.el;h=0182813161361bada1f60fbd2b8593d3e89e68c4;hp=ba66fce9e5ac5d3533535f8bc0787256ed320e79;hb=b3b111c08ece2cc499656fcb321bf25ad52f3d0d;hpb=56f55f8902c6603989cd6b03d28bc9ea72959678

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index ba66fce..0182813 100644
--- 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)