Check if event was not consumed

Fixes #9096
This commit is contained in:
Philipp Hörist 2018-12-21 23:13:34 +01:00
parent f93797e26d
commit 29eea2f1b1
1 changed files with 6 additions and 0 deletions

View File

@ -1694,18 +1694,24 @@ class Interface:
self.roster.open_event(account, fjid, event) self.roster.open_event(account, fjid, event)
elif type_ == 'gc-invitation': elif type_ == 'gc-invitation':
event = app.events.get_first_event(account, jid, type_) event = app.events.get_first_event(account, jid, type_)
if event is None:
return
dialogs.InvitationReceivedDialog(account, event.room_jid, jid, dialogs.InvitationReceivedDialog(account, event.room_jid, jid,
event.password, event.reason, event.is_continued) event.password, event.reason, event.is_continued)
app.events.remove_events(account, jid, event) app.events.remove_events(account, jid, event)
self.roster.draw_contact(jid, account) self.roster.draw_contact(jid, account)
elif type_ == 'subscription_request': elif type_ == 'subscription_request':
event = app.events.get_first_event(account, jid, type_) event = app.events.get_first_event(account, jid, type_)
if event is None:
return
dialogs.SubscriptionRequestWindow(jid, event.text, account, dialogs.SubscriptionRequestWindow(jid, event.text, account,
event.nick) event.nick)
app.events.remove_events(account, jid, event) app.events.remove_events(account, jid, event)
self.roster.draw_contact(jid, account) self.roster.draw_contact(jid, account)
elif type_ == 'unsubscribed': elif type_ == 'unsubscribed':
event = app.events.get_first_event(account, jid, type_) event = app.events.get_first_event(account, jid, type_)
if event is None:
return
self.show_unsubscribed_dialog(account, event.contact) self.show_unsubscribed_dialog(account, event.contact)
app.events.remove_events(account, jid, event) app.events.remove_events(account, jid, event)
self.roster.draw_contact(jid, account) self.roster.draw_contact(jid, account)