Commit a7ab0cf5 authored by Maxime Buquet's avatar Maxime Buquet

Merge branch 'privatetab-creation-traceback' into 'master'

Prevent Traceback when receiving MUC-PM carbons under some conditions

See merge request !57
parents 6b211032 9007b0fc
...@@ -797,7 +797,9 @@ class HandlerCore: ...@@ -797,7 +797,9 @@ class HandlerCore:
if body and not ignore: if body and not ignore:
tab = self.core.open_private_window(room_from, with_nick, tab = self.core.open_private_window(room_from, with_nick,
False) 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 or self.core.own_nick) if sent else with_nick
if ignore and not sent: if ignore and not sent:
self.core.events.trigger('ignored_private', message, tab) self.core.events.trigger('ignored_private', message, tab)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment