fix: dde-file-manager crash, clipboard crash

dde-file-manager crash, clipboard crash Log: dde-file-manager crash, clipboard crash
linuxdeepin · Aug 27, 2024 · d2684fd · d2684fd
1 parent aad21d8
commit d2684fd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/dfm-base/utils/clipboard.cpp b/src/dfm-base/utils/clipboard.cpp
@@ -11,6 +11,7 @@
 #include <dfm-base/file/local/localfileiconprovider.h>
 #include <dfm-base/mimetype/mimetypedisplaymanager.h>
 #include <dfm-base/utils/fileutils.h>
+#include <dfm-base/widgets/filemanagerwindowsmanager.h>
 
 #include <QApplication>
 #include <QClipboard>
@@ -32,6 +33,7 @@ static QList<QUrl> clipboardFileUrls;
 static QMutex clipboardFileUrlsMutex;
 static QAtomicInt remoteCurrentCount = 0;
 static ClipBoard::ClipboardAction clipboardAction = ClipBoard::kUnknownAction;
+static std::atomic_bool canReadClipboard { true };
 
 static constexpr char kUserIdKey[] = "userId";
 static constexpr char kRemoteCopyKey[] = "uos/remote-copy";
@@ -40,6 +42,8 @@ static constexpr char kRemoteAssistanceCopyKey[] = "uos/remote-copied-files";
 
 void onClipboardDataChanged()
 {
+    if (!canReadClipboard)
+        return;
 
     QMutexLocker lk(&clipboardFileUrlsMutex);
     clipboardFileUrls.clear();
@@ -92,6 +96,14 @@ ClipBoard::ClipBoard(QObject *parent)
         onClipboardDataChanged();
         emit clipboardDataChanged();
     });
+
+    connect(&FileManagerWindowsManager::instance(),
+            &FileManagerWindowsManager::windowCreated, this, []{
+        GlobalData::canReadClipboard = true;
+    });
+    connect(&FileManagerWindowsManager::instance(), &FileManagerWindowsManager::lastWindowClosed, this, []{
+        GlobalData::canReadClipboard = false;
+    });
 }
 
 ClipBoard *ClipBoard::instance()

diff --git a/src/dfm-base/utils/windowutils.h b/src/dfm-base/utils/windowutils.h
@@ -25,6 +25,7 @@ class WindowUtils
     static bool keyCtrlIsPressed();
 
     static bool keyAltIsPressed();
+
     static QScreen *cursorScreen();
 };