fix: [disc] cd to computer when a file deleted from subdir

This is an issue introduced by bug-202249 Log: as title Bug: https://pms.uniontech.com/bug-view-261005.html
linuxdeepin · Jun 25, 2024 · 503540f · 503540f
1 parent ff3a5b8
commit 503540f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/plugins/filemanager/dfmplugin-optical/events/opticaleventreceiver.cpp b/src/plugins/filemanager/dfmplugin-optical/events/opticaleventreceiver.cpp
@@ -189,13 +189,15 @@ bool OpticalEventReceiver::detailViewIcon(const QUrl &url, QString *iconName)
     return false;
 }
 
-bool OpticalEventReceiver::handleTabClosable(const QUrl &currentUrl, const QUrl &rootUrl)
+bool OpticalEventReceiver::handleTabCloseable(const QUrl &currentUrl, const QUrl &rootUrl)
 {
     const auto &scheme { OpticalHelper::scheme() };
     if (currentUrl.scheme() != scheme || rootUrl.scheme() != scheme)
         return false;
 
-    if (OpticalHelper::burnIsOnStaging(currentUrl)) {
+    // 当前所在的目录正在待刻录的目录中（staging），而一个磁盘的目录被删除了（disc）这意味着
+    // 光盘被卸载， 因此需要关闭当前tab
+    if (OpticalHelper::burnIsOnStaging(currentUrl) && OpticalHelper::burnIsOnDisc(rootUrl)) {
         const QString &rootDev { OpticalHelper::burnDestDevice(rootUrl) };
         const QString &curDev { OpticalHelper::burnDestDevice(currentUrl) };
         if (rootDev == curDev) {

diff --git a/src/plugins/filemanager/dfmplugin-optical/events/opticaleventreceiver.h b/src/plugins/filemanager/dfmplugin-optical/events/opticaleventreceiver.h
@@ -29,7 +29,7 @@ public slots:
     bool handleDropFiles(const QList<QUrl> &fromUrls, const QUrl &toUrl);
     bool handleBlockShortcutPaste(quint64 winId, const QList<QUrl> &fromUrls, const QUrl &to);
     bool detailViewIcon(const QUrl &url, QString *iconName);
-    bool handleTabClosable(const QUrl &currentUrl, const QUrl &rootUrl);
+    bool handleTabCloseable(const QUrl &currentUrl, const QUrl &rootUrl);
 
 private:
     bool isContainPWSubDirFile(const QList<QUrl> &urls);