From 8f75e10d2fed7fdca09ba5f3cdaea70654a27303 Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Mon, 1 Jun 2015 13:49:19 +0200 Subject: Use the password stored in the MucTab, with /join, if none is found otherwise --- src/core/commands.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core/commands.py b/src/core/commands.py index 3830d72a..974c706f 100644 --- a/src/core/commands.py +++ b/src/core/commands.py @@ -387,13 +387,18 @@ def command_join(self, args, histo_length=None): seconds = int(seconds) else: seconds = 0 - if password: - tab.password = password + # If we didn’t have a password by now (from a bookmark or the + # explicit argument), just use the password that is stored in the + # tab because of our last join + if not password: + password = tab.password muc.join_groupchat(self, room, nick, password, histo_length, current_status.message, current_status.show, seconds=seconds) + # Store in the tab the password we used, for later use + tab.password = password if not tab: self.open_new_room(room, nick, password=password) muc.join_groupchat(self, room, nick, password, -- cgit v1.2.3