From de4660b2e5382fdcf2fb934f456f66e75886bd85 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sat, 3 Dec 2011 13:33:03 +0100 Subject: [PATCH] prevent traceback. Fixes #7053 --- src/common/connection_handlers_events.py | 1 + src/session.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py index 74df0ae66..99e0617dc 100644 --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1203,6 +1203,7 @@ class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.forwarded = self.msg_obj.forwarded self.sent = self.msg_obj.sent self.popup = False + self.msg_id = None # id in log database self.receipt_request_tag = self.stanza.getTag('request', namespace=xmpp.NS_RECEIPTS) diff --git a/src/session.py b/src/session.py index 295d61735..b41cc9e24 100644 --- a/src/session.py +++ b/src/session.py @@ -74,8 +74,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): if self.control and self.control.resource: self.control.change_resource(self.resource) - obj.msg_id = None - if obj.mtype == 'chat': if not obj.stanza.getTag('body') and obj.chatstate is None: return