aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Buquet2020-01-12 12:28:12 (GMT)
committerMaxime Buquet2020-01-12 12:28:12 (GMT)
commita7ab0cf59da50bafdeaafe36ff3fe3c206075e95 (patch)
treef641a6edd3f8555ad10a68e13605d41ca9bdc9a2
parent6b2110329b712af1f15c2c521b21ed650e8e8537 (diff)
parent9007b0fc8b89c4b0e66f80ec7f50abd36ae36196 (diff)
downloadpoezio-a7ab0cf59da50bafdeaafe36ff3fe3c206075e95.tar.gz
poezio-a7ab0cf59da50bafdeaafe36ff3fe3c206075e95.tar.xz
Merge branch 'privatetab-creation-traceback' into 'master'refs/keep-around/a7ab0cf59da50bafdeaafe36ff3fe3c206075e95
Prevent Traceback when receiving MUC-PM carbons under some conditions See merge request poezio/poezio!57
-rw-r--r--poezio/core/handlers.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 8f2f258..cfa5a14 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -797,7 +797,9 @@ class HandlerCore:
if body and not ignore:
tab = self.core.open_private_window(room_from, with_nick,
False)
- sender_nick = (tab.own_nick
+ # Tab can still be None here, when receiving carbons of a MUC-PM for
+ # example
+ sender_nick = (tab and tab.own_nick
or self.core.own_nick) if sent else with_nick
if ignore and not sent:
self.core.events.trigger('ignored_private', message, tab)