From cf44cf7cdec9fdb35caa372563d57e7045dc29dd Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sat, 11 Jun 2016 13:52:37 +0200
Subject: Fix /join /nick on non-joined tabs

(and correct the display on joined tabs)
---
 src/core/commands.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/core')

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('@'):
-- 
cgit v1.2.3