summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2016-06-11 13:52:37 +0200
committermathieui <mathieui@mathieui.net>2016-06-11 13:52:37 +0200
commitcf44cf7cdec9fdb35caa372563d57e7045dc29dd (patch)
tree25fbe1d260e3628ddb6429261c9b41f4f3068df7 /src/core
parent7072b8f6355cabeb633ed38d6ab147bb2c359a51 (diff)
downloadpoezio-cf44cf7cdec9fdb35caa372563d57e7045dc29dd.tar.gz
poezio-cf44cf7cdec9fdb35caa372563d57e7045dc29dd.tar.bz2
poezio-cf44cf7cdec9fdb35caa372563d57e7045dc29dd.tar.xz
poezio-cf44cf7cdec9fdb35caa372563d57e7045dc29dd.zip
Fix /join /nick on non-joined tabs
(and correct the display on joined tabs)
Diffstat (limited to 'src/core')
-rw-r--r--src/core/commands.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/commands.py b/src/core/commands.py
index c423ce10..a0a636c1 100644
--- a/src/core/commands.py
+++ b/src/core/commands.py
@@ -355,13 +355,15 @@ def command_join(self, args):
if room in self.pending_invites:
del self.pending_invites[room]
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)
- if tab.own_nick == nick:
+ if tab.own_nick == nick and tab.joined:
self.information('/join: Nothing to do.', 'Info')
else:
+ tab.command_part('')
tab.own_nick = nick
- tab.command_cycle('')
+ tab.join()
+
return
if room.startswith('@'):