From d226c60997b8b65d17a1ba706aed59a8400dd757 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Fri, 31 Jul 2015 16:49:15 +0200
Subject: Only reset the self-ping event timer if there was already an enabled
 timer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise we could, for example, enable a self-ping event on non-joined
rooms where we just displayed an error message. And that’s bad.
---
 src/tabs/muctab.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/tabs')

diff --git a/src/tabs/muctab.py b/src/tabs/muctab.py
index e7be0597..38592dff 100644
--- a/src/tabs/muctab.py
+++ b/src/tabs/muctab.py
@@ -1618,7 +1618,8 @@ class MucTab(ChatTab):
         """
 
         # reset self-ping interval
-        self.enable_self_ping_event()
+        if self.self_ping_event:
+            self.enable_self_ping_event()
 
         self.log_message(txt, nickname, time=time, typ=kwargs.get('typ', 1))
         args = dict()
-- 
cgit v1.2.3