Fix /join /nick on non-joined tabs
(and correct the display on joined tabs)
This commit is contained in:
parent
7072b8f635
commit
cf44cf7cde
1 changed files with 5 additions and 3 deletions
|
@ -355,13 +355,15 @@ def command_join(self, args):
|
||||||
if room in self.pending_invites:
|
if room in self.pending_invites:
|
||||||
del self.pending_invites[room]
|
del self.pending_invites[room]
|
||||||
tab = self.get_tab_by_name(room, tabs.MucTab)
|
tab = self.get_tab_by_name(room, tabs.MucTab)
|
||||||
if tab is not None and tab.joined: # if we are already in the room
|
if tab is not None:
|
||||||
self.focus_tab_named(tab.name)
|
self.focus_tab_named(tab.name)
|
||||||
if tab.own_nick == nick:
|
if tab.own_nick == nick and tab.joined:
|
||||||
self.information('/join: Nothing to do.', 'Info')
|
self.information('/join: Nothing to do.', 'Info')
|
||||||
else:
|
else:
|
||||||
|
tab.command_part('')
|
||||||
tab.own_nick = nick
|
tab.own_nick = nick
|
||||||
tab.command_cycle('')
|
tab.join()
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
if room.startswith('@'):
|
if room.startswith('@'):
|
||||||
|
|
Loading…
Reference in a new issue