aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java20
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);
+ }
}
}