Suppres "Invalid timer" error when jabber-keepalive-timeout-timer is nil by some...

TBD: trace why jabber-keepalive-timeout-timer is nil sometimes.

diff --git a/jabber-keepalive.el b/jabber-keepalive.el
index d4f221f..7c424c1 100644 (file)
--- a/jabber-keepalive.el
+++ b/jabber-keepalive.el
@@ -105,7 +105,7 @@ for all accounts regardless of the argument."
             (current-time-string)
             (plist-get (fsm-get-state-data jc) :server)))
   (setq jabber-keepalive-pending (remq jc jabber-keepalive-pending))
-  (when (null jabber-keepalive-pending)
+  (when (and (null jabber-keepalive-pending) (timerp jabber-keepalive-timeout-timer))
     (jabber-cancel-timer jabber-keepalive-timeout-timer)
     (setq jabber-keepalive-timeout-timer nil)))