diff lisp/erc/erc-netsplit.el @ 86836:11b4896b439a

Sync from upstream ERC - Parse 307 (nick has identified) responses. - Only activate some things if the connection has been established.
author Michael Olson <mwolson@gnu.org>
date Thu, 29 Nov 2007 22:36:38 +0000
parents 85d67fae9a94
children 107ccd98fa12
line wrap: on
line diff
--- a/lisp/erc/erc-netsplit.el	Thu Nov 29 21:57:25 2007 +0000
+++ b/lisp/erc/erc-netsplit.el	Thu Nov 29 22:36:38 2007 +0000
@@ -173,13 +173,14 @@
 
 (defun erc-netsplit-timer (now)
   "Clean cruft from `erc-netsplit-list' older than 10 minutes."
-  (dolist (elt erc-netsplit-list)
-    (when (> (erc-time-diff (cadr elt) now) 600)
-      (when erc-netsplit-debug
-	(erc-display-message
-	 nil 'notice (current-buffer)
-	 (concat "Netsplit: Removing " (car elt))))
-      (setq erc-netsplit-list (delq elt erc-netsplit-list)))))
+  (when erc-server-connected
+    (dolist (elt erc-netsplit-list)
+      (when (> (erc-time-diff (cadr elt) now) 600)
+	(when erc-netsplit-debug
+	  (erc-display-message
+	   nil 'notice (current-buffer)
+	   (concat "Netsplit: Removing " (car elt))))
+	(setq erc-netsplit-list (delq elt erc-netsplit-list))))))
 
 ;;;###autoload
 (defun erc-cmd-WHOLEFT ()