diff options
| author | veteran29 <veteran29q+github@gmail.com> | 2015-03-06 17:24:52 +0100 |
|---|---|---|
| committer | veteran29 <veteran29q+github@gmail.com> | 2015-03-06 17:24:52 +0100 |
| commit | 58e871b8ddbaa79077ad22835bdecc61b2526ac2 (patch) | |
| tree | 1ad0ceef1e5d5772daf6e35e32ac927c55baf8f6 /src/net/java/sip/communicator/impl | |
| parent | 6e3e3d21ea6804dfdc7863defddcc5024178f331 (diff) | |
| download | jitsi-58e871b8ddbaa79077ad22835bdecc61b2526ac2.zip jitsi-58e871b8ddbaa79077ad22835bdecc61b2526ac2.tar.gz jitsi-58e871b8ddbaa79077ad22835bdecc61b2526ac2.tar.bz2 | |
Fixes all chat windows being closed when grouping of chat windows is disabled.
Diffstat (limited to 'src/net/java/sip/communicator/impl')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java index bca8692..d53841d 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java @@ -744,9 +744,23 @@ public class ChatWindow } } else - { - GuiActivator - .getUIService().getChatWindowManager().closeAllChats(this, true); + { + if(ConfigurationUtils.isMultiChatWindowEnabled()) + { + GuiActivator + .getUIService().getChatWindowManager().closeAllChats(this, true); + } + else + { + ChatPanel chatPanel = getCurrentChat(); + + if(chatPanel == null + || chatPanel.getChatConversationPanel() == null) + return; + + GuiActivator + .getUIService().getChatWindowManager().closeChat(chatPanel); + } } } |