summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Buquet <pep@bouah.net>2020-06-24 18:54:49 +0200
committerMaxime Buquet <pep@bouah.net>2020-06-24 18:54:49 +0200
commit6fb1a27674cce79ad203d23d5d557378fc91cdff (patch)
tree69ec47fcdcec89d92f85142f4c839203f7cab201
parent57cbbc1bde478fe18b6272430c88e57bbb12674e (diff)
parentcf65466bcecddedb591baadf29a9896e65cf783e (diff)
downloadpoezio-6fb1a27674cce79ad203d23d5d557378fc91cdff.tar.gz
poezio-6fb1a27674cce79ad203d23d5d557378fc91cdff.tar.bz2
poezio-6fb1a27674cce79ad203d23d5d557378fc91cdff.tar.xz
poezio-6fb1a27674cce79ad203d23d5d557378fc91cdff.zip
Merge branch 'muc-close-inexisting-bookmarks' into 'master'
Muc close inexisting bookmarks See merge request poezio/poezio!147
-rw-r--r--CHANGELOG1
-rw-r--r--poezio/tabs/muctab.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index adcab884..c30cf44e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ https://dev.louiz.org/projects/poezio/roadmap
- Reorder: Prevent GapTabs from being serialized and ignore when serialized as
they're recreated automatically.
+- Ensure bookmark is present before removing it in /close.
# Bug fixes
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index 1d4b9657..71eb3411 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -1530,6 +1530,8 @@ class MucTab(ChatTab):
"""
self.leave_room(msg)
if config.get('synchronise_open_rooms'):
+ if self.jid not in self.core.bookmarks:
+ return
self.core.bookmarks[self.jid].autojoin = False
self.core.bookmarks.save(self.core.xmpp)
self.core.close_tab(self)