From 430649f58f8d080558471523552170cc92a6baf3 Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 21 Mar 2019 08:54:59 +0100 Subject: [PATCH] plugin XEP-0198: reset req_timer on session.reset(): req_timer may not have been called when session.reset() is called (e.g. on resuming failed after computer has been suspended), so reset() must cancel it and set its value to None. --- sat/plugins/plugin_xep_0198.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sat/plugins/plugin_xep_0198.py b/sat/plugins/plugin_xep_0198.py index 2b07b8da..a4d2b0f0 100755 --- a/sat/plugins/plugin_xep_0198.py +++ b/sat/plugins/plugin_xep_0198.py @@ -116,6 +116,12 @@ class ProfileSessionData(object): self.session_id = self.location = None self.ack_requested = False self.last_ack_r = 0 + if self.req_timer is not None: + if self.req_timer.active(): + log.error(u"req_timer has been called/cancelled but not reset") + else: + self.req_timer.cancel() + self.req_timer = None class XEP_0198(object):