diff options
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java | 6 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java index 9c082b7..f3cd45e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java @@ -1968,6 +1968,12 @@ public class ChatPanel */ public void loadHistory(final String escapedMessageID) { + if (!ConfigurationUtils.isHistoryShown()) + { + isHistoryLoaded = true; + return; + } + SwingWorker historyWorker = new SwingWorker() { private Collection<Object> historyList; diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java index d029cca..8307bd7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java @@ -1212,8 +1212,7 @@ public class ChatWindowManager this.chatPanels.add(chatPanel); } - if (ConfigurationUtils.isHistoryShown()) - chatPanel.loadHistory(escapedMessageID); + chatPanel.loadHistory(escapedMessageID); fireChatCreated(chatPanel); return chatPanel; @@ -1314,8 +1313,7 @@ public class ChatWindowManager this.chatPanels.add(chatPanel); } - if (ConfigurationUtils.isHistoryShown()) - chatPanel.loadHistory(escapedMessageID); + chatPanel.loadHistory(escapedMessageID); fireChatCreated(chatPanel); return chatPanel; @@ -1347,8 +1345,7 @@ public class ChatWindowManager this.chatPanels.add(chatPanel); } - if (ConfigurationUtils.isHistoryShown()) - chatPanel.loadHistory(escapedMessageID); + chatPanel.loadHistory(escapedMessageID); fireChatCreated(chatPanel); return chatPanel; |