From 30b5c8a2f44d63ef714271920ba9ad26ea1351b5 Mon Sep 17 00:00:00 2001 From: XuSt <50353838+itsXuSt@users.noreply.github.com> Date: Fri, 21 Jun 2024 10:45:58 +0800 Subject: [PATCH] Revert "fix: dde-file-manager crash" This reverts commit 8db8969b97da62572394ac1fb12d6b3b3f739db5. --- .../core/dfmplugin-recent/utils/recentmanager.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/plugins/filemanager/core/dfmplugin-recent/utils/recentmanager.cpp b/src/plugins/filemanager/core/dfmplugin-recent/utils/recentmanager.cpp index f154eb5bd6..668091f08a 100644 --- a/src/plugins/filemanager/core/dfmplugin-recent/utils/recentmanager.cpp +++ b/src/plugins/filemanager/core/dfmplugin-recent/utils/recentmanager.cpp @@ -176,10 +176,8 @@ RecentManager::RecentManager(QObject *parent) RecentManager::~RecentManager() { - if (watcher) { - watcher->disconnect(this); + if (watcher) watcher->stopWatcher(); - } iteratorWorker->stop(); workerThread.quit(); workerThread.wait(15000); @@ -187,15 +185,6 @@ RecentManager::~RecentManager() void RecentManager::init() { - connect(qApp, &QApplication::aboutToQuit, this, [this](){ - if (watcher) { - watcher->disconnect(this); - watcher->stopWatcher(); - } - iteratorWorker->stop(); - workerThread.quit(); - workerThread.wait(150); - }); iteratorWorker->moveToThread(&workerThread); connect(&workerThread, &QThread::finished, iteratorWorker, &QObject::deleteLater); connect(this, &RecentManager::asyncHandleFileChanged,