* net/rcirc.el (rcirc-keepalive): Fix invalid timer error.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 61b282c7118..77759eee9a1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-17  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-keepalive): Fix invalid timer error.
+
 2013-02-17  Glenn Morris  <rgm@gnu.org>
 
         * menu-bar.el (menu-bar-tools-menu): Fix case of EDE entry.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 086043c2b4a..7c70ded3eaa 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -625,7 +625,8 @@ last ping."
                                            (rcirc-float-time))))))
             (rcirc-process-list))
     ;; no processes, clean up timer
-    (cancel-timer rcirc-keepalive-timer)
+    (when (timerp rcirc-keepalive-timer)
+      (cancel-timer rcirc-keepalive-timer))
     (setq rcirc-keepalive-timer nil)))
 
 (defun rcirc-handler-ctcp-KEEPALIVE (process target sender message)