summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-08-04 18:55:18 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-08-11 10:27:47 (GMT)
commit88dbda0ca538b30e0b001344fbcf8a36ff1abe1a (patch)
treec8cc137aa4bbdc46403327a394651665b7459cb2
parent4d82839a2be335bbc4317ed802cb89dc7f03564e (diff)
downloadswift-88dbda0ca538b30e0b001344fbcf8a36ff1abe1a.zip
swift-88dbda0ca538b30e0b001344fbcf8a36ff1abe1a.tar.bz2
Fix broken bookmarks context menu after reconnect
Test-Information: Tested that the bookmarks context menu still works after an offline/online cycle. Change-Id: I9248b7405a6a09bc813c6590e0f2f9a4ed92acb3
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index f39f503..e11d14b 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -689,7 +689,6 @@ void ChatsManager::setOnline(bool enabled) {
}
}
if (!enabled) {
- chatListWindow_->setBookmarksEnabled(false);
markAllRecentsOffline();
} else {
setupBookmarks();
@@ -700,6 +699,9 @@ void ChatsManager::setOnline(bool enabled) {
localMUCServiceFinderWalker_->beginWalk();
}
+ if (chatListWindow_) {
+ chatListWindow_->setBookmarksEnabled(enabled);
+ }
}
void ChatsManager::handleChatRequest(const std::string &contact) {