Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-05-07 13:04:39 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-05-07 13:04:39 (GMT) |
| commit | 7860e69576284f94baa433436c0ae2af6e194c64 (patch) | |
| tree | 367914422861fd6030825fa4a414d87491f35f9f /Swift/Controllers/Chat/ChatsManager.cpp | |
| parent | 48f5bf16ff9e2c8acd095bed521ff7951a8afddf (diff) | |
| download | swift-7860e69576284f94baa433436c0ae2af6e194c64.zip swift-7860e69576284f94baa433436c0ae2af6e194c64.tar.bz2 | |
Don't open MUC PMs to different people into the same window
Resolves: #317
Diffstat (limited to 'Swift/Controllers/Chat/ChatsManager.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/ChatsManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp index 312af76..a4ade48 100644 --- a/Swift/Controllers/Chat/ChatsManager.cpp +++ b/Swift/Controllers/Chat/ChatsManager.cpp @@ -172,7 +172,7 @@ void ChatsManager::handleChatRequest(const String &contact) { ChatController* ChatsManager::getChatControllerOrFindAnother(const JID &contact) { ChatController* controller = getChatControllerIfExists(contact); - if (!controller) { + if (!controller && !isMUC(contact.toBare())) { foreach (JIDChatControllerPair pair, chatControllers_) { if (pair.first.toBare() == contact.toBare()) { controller = pair.second; |