fix: unable get docked entriy by soft link path

set canonicalFilePath instead of absoluteFilePath for deskfileinfo and find it by canonicalFilePath instead of user input path log: use canonicalFilePath instead of absoluteFilePath
linuxdeepin · Jan 23, 2024 · 3939ca9 · 3939ca9
1 parent 0300e28
commit 3939ca9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/frame/taskmanager/desktopinfo.cpp b/frame/taskmanager/desktopinfo.cpp
@@ -40,7 +40,7 @@ DesktopInfo::DesktopInfo(const QString &desktopfile)
         }
     }
 
-    m_desktopFilePath = desktopFileInfo.absoluteFilePath();
+    m_desktopFilePath = desktopFileInfo.canonicalFilePath();
     m_isValid = desktopFileInfo.isAbsolute() && QFile::exists(desktopFileInfo.absoluteFilePath());
     m_desktopFile.reset(new QSettings(m_desktopFilePath, QSettings::IniFormat));
     m_desktopFile->setIniCodec("utf-8");

diff --git a/frame/taskmanager/entries.cpp b/frame/taskmanager/entries.cpp
@@ -162,9 +162,11 @@ QList<Entry*> Entries::getEntries()
 
 Entry *Entries::getDockedEntryByDesktopFile(const QString &desktopFile)
 {
+    QFileInfo desktopFileInfo(desktopFile);
+
     Entry *ret = nullptr;
     for (auto entry : filterDockedEntries()) {
-        if ((entry->isValid()) && desktopFile == entry->getFileName()) {
+        if ((entry->isValid()) && desktopFileInfo.canonicalFilePath() == entry->getFileName()) {
             ret = entry;
             break;
         }