From 58e871b8ddbaa79077ad22835bdecc61b2526ac2 Mon Sep 17 00:00:00 2001 From: veteran29 Date: Fri, 6 Mar 2015 17:24:52 +0100 Subject: Fixes all chat windows being closed when grouping of chat windows is disabled. --- .../communicator/impl/gui/main/chat/ChatWindow.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/net/java/sip/communicator/impl') 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); + } } } -- cgit v1.1