diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2009-06-17 13:39:45 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2009-06-17 13:39:45 +0000 |
| commit | ee0423e87cf3f5a9e03a3c2d3e3c046592ead7cb (patch) | |
| tree | 8349e499e0583cbb7e57bd7c4bd3f326a0f6cabc /src/net/java/sip | |
| parent | e18da12eb03896fe257d05de9a69074fd3398518 (diff) | |
| download | jitsi-ee0423e87cf3f5a9e03a3c2d3e3c046592ead7cb.zip jitsi-ee0423e87cf3f5a9e03a3c2d3e3c046592ead7cb.tar.gz jitsi-ee0423e87cf3f5a9e03a3c2d3e3c046592ead7cb.tar.bz2 | |
Fix for disappearing messages when history in chat window is disabled.
Diffstat (limited to 'src/net/java/sip')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java | 5 |
1 files changed, 2 insertions, 3 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 0ef6060..ef17f33 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 @@ -30,7 +30,6 @@ import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.event.*; import net.java.sip.communicator.util.*; import net.java.sip.communicator.util.swing.*; -import net.java.sip.communicator.util.swing.SwingWorker; /** * The <tt>ChatPanel</tt> is the panel, where users can write and send messages, @@ -566,7 +565,7 @@ public class ChatPanel ChatMessage chatMessage = new ChatMessage(contactName, date, messageType, message, contentType); - if (!isHistoryLoaded) + if (ConfigurationManager.isHistoryShown() && !isHistoryLoaded) { synchronized (incomingEventBuffer) { @@ -1560,7 +1559,7 @@ public class ChatPanel ReceiveFileConversationComponent component = new ReceiveFileConversationComponent(request); - if (!isHistoryLoaded) + if (ConfigurationManager.isHistoryShown() && !isHistoryLoaded) { synchronized (incomingEventBuffer) { |