diff options
| author | Maxime Buquet <pep@bouah.net> | 2020-05-28 00:35:30 +0200 |
|---|---|---|
| committer | Maxime Buquet <pep@bouah.net> | 2020-05-28 00:35:30 +0200 |
| commit | 1b8618d6906eaeb572f01dcf2c3e75887e2d4763 (patch) | |
| tree | e40ecac3e9c886f9027f9f9a30d070914e94ec4c /poezio/core | |
| parent | 5cf90368c66e0ccc3a93e51911f8fa82b496e02b (diff) | |
| parent | 9e3958c67d2e7d16a069b50ef2e76d92280b6584 (diff) | |
| download | poezio-1b8618d6906eaeb572f01dcf2c3e75887e2d4763.tar.gz poezio-1b8618d6906eaeb572f01dcf2c3e75887e2d4763.tar.bz2 poezio-1b8618d6906eaeb572f01dcf2c3e75887e2d4763.tar.xz poezio-1b8618d6906eaeb572f01dcf2c3e75887e2d4763.zip | |
Merge branch 'fix-synchronise-rooms' into 'master'
Only add autojoin to a bookmark on creation if the room is not bookmarked
See merge request poezio/poezio!131
Diffstat (limited to 'poezio/core')
| -rw-r--r-- | poezio/core/commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/poezio/core/commands.py b/poezio/core/commands.py index 176d0e73..6fc800ae 100644 --- a/poezio/core/commands.py +++ b/poezio/core/commands.py @@ -401,7 +401,7 @@ class CommandCore: tab.password = password tab.join() - if config.get('synchronise_open_rooms'): + if config.get('synchronise_open_rooms') and room not in self.core.bookmarks: method = 'remote' if config.get( 'use_remote_bookmarks') else 'local' self._add_bookmark('%s/%s' % (room, nick), True, password, method) |