Avoid duplicate FileTransfer-panel when the chat history is enabled

13 years ago · 14c78d292c
parent 67857bddcf
commit 14c78d292c
2 changed files with 8 additions and 5 deletions
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@ -722,10 +722,13 @@ else if (o instanceof FileRecord)
            {
                FileRecord fileRecord = (FileRecord) o;

-                FileHistoryConversationComponent component
-                    = new FileHistoryConversationComponent(fileRecord);
-
-                conversationPanel.addComponent(component);
+                if (!fileRecord.getID().equals(escapedMessageID))
+                {
+                    FileHistoryConversationComponent component
+                        = new FileHistoryConversationComponent(fileRecord);
+    
+                    conversationPanel.addComponent(component);
+                }
            }

            if (historyString != null)
--- a/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
+++ b/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
@ -739,7 +739,7 @@ public void fileTransferRequestReceived(FileTransferRequestEvent event)
                    INCOMING_FILE,
                    title,
                    request.getFileName(),
-                    null);
+                    request.getID());
        }
        catch(Throwable t)
        {