fix(chatlog): Don't delete active transfer widget

Fix #3275.
qTox · Jul 31, 2016 · abf7b42 · abf7b42
1 parent 233cc41
commit abf7b42
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/chatlog/chatlog.cpp b/src/chatlog/chatlog.cpp
@@ -20,6 +20,8 @@
 #include "chatlog.h"
 #include "chatmessage.h"
 #include "chatlinecontent.h"
+#include "chatlinecontentproxy.h"
+#include "content/filetransferwidget.h"
 #include "src/widget/translator.h"
 
 #include <QDebug>
@@ -560,11 +562,20 @@ void ChatLog::clear()
 {
     clearSelection();
 
+    QVector<ChatLine::Ptr> savedLines;
+
     for (ChatLine::Ptr l : lines)
-        l->removeFromScene();
+    {
+        if (isActiveFileTransfer(l))
+            savedLines.push_back(l);
+        else
+            l->removeFromScene();
+    }
 
     lines.clear();
     visibleLines.clear();
+    for (ChatLine::Ptr l : savedLines)
+        insertChatlineAtBottom(l);
 
     updateSceneRect();
 }
@@ -850,3 +861,22 @@ void ChatLog::retranslateUi()
     copyAction->setText(tr("Copy"));
     selectAllAction->setText(tr("Select all"));
 }
+
+bool ChatLog::isActiveFileTransfer(ChatLine::Ptr l)
+{
+    int count = l->getColumnCount();
+    for (int i = 0; i < count; i++)
+    {
+        ChatLineContent *content = l->getContent(i);
+        ChatLineContentProxy *proxy = dynamic_cast<ChatLineContentProxy*>(content);
+        if (!proxy)
+            continue;
+
+        QWidget *widget = proxy->getWidget();
+        FileTransferWidget *transferWidget = dynamic_cast<FileTransferWidget*>(widget);
+        if (transferWidget && transferWidget->isActive())
+            return true;
+    }
+
+    return false;
+}
diff --git a/src/chatlog/chatlog.h b/src/chatlog/chatlog.h
@@ -106,6 +106,7 @@ private slots:
 
 private:
     void retranslateUi();
+    bool isActiveFileTransfer(ChatLine::Ptr l);
 
 private:
     enum SelectionMode {