Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-08-20 10:44:28 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-08-20 10:44:30 (GMT) |
| commit | cd21e4aba3f26b8c6bde360c6ebb12cbc1ee5ed2 (patch) | |
| tree | 4aad14b13f7def2f3675f5cdc8b39194ae2a3198 /Swift | |
| parent | 61fed862adef959508558161298e6d11e5cc0903 (diff) | |
| download | swift-cd21e4aba3f26b8c6bde360c6ebb12cbc1ee5ed2.zip swift-cd21e4aba3f26b8c6bde360c6ebb12cbc1ee5ed2.tar.bz2 | |
Fix chats sometimes not re-opening on new messages.
Resolves: #533
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Controllers/Chat/ChatControllerBase.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp index b86a993..e38d12d 100644 --- a/Swift/Controllers/Chat/ChatControllerBase.cpp +++ b/Swift/Controllers/Chat/ChatControllerBase.cpp @@ -122,7 +122,7 @@ void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> m if (messageEvent->isReadable()) { unreadMessages_.push_back(messageEvent); } - chatWindow_->setUnreadMessageCount(unreadMessages_.size()); + preHandleIncomingMessage(messageEvent); @@ -160,6 +160,8 @@ void ChatControllerBase::handleIncomingMessage(boost::shared_ptr<MessageEvent> m addMessage(body, senderDisplayNameFromMessage(from), isIncomingMessageFromMe(message), maybeLabel, String(avatarManager_->getAvatarPath(from).string()), timeStamp); } + chatWindow_->show(); + chatWindow_->setUnreadMessageCount(unreadMessages_.size()); } String ChatControllerBase::getErrorMessage(boost::shared_ptr<ErrorPayload> error) { |