From 1c2fbdef09f1756c337cab39c2d229b22b11fb5b Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A9ven=20Car?= Date: Thu, 5 Nov 2020 07:58:24 +0100 Subject: [PATCH] KDirectoryContentsCounter: fix support of symlinks dir BUG: 428712 FIXED-IN: 20.12 --- src/kitemviews/private/kdirectorycontentscounter.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp index d33277a3b..a2a27ad28 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.cpp +++ b/src/kitemviews/private/kdirectorycontentscounter.cpp @@ -115,7 +115,7 @@ void KDirectoryContentsCounter::slotResult(const QString& path, int count, long } // sends the results - Q_EMIT result(resolvedPath, count, size); + Q_EMIT result(path, count, size); } void KDirectoryContentsCounter::slotDirWatchDirty(const QString& path) @@ -160,11 +160,12 @@ void KDirectoryContentsCounter::slotItemsRemoved() void KDirectoryContentsCounter::startWorker(const QString& path) { - const bool alreadyInCache = s_cache->contains(path); + const QString resolvedPath = QFileInfo(path).canonicalFilePath(); + const bool alreadyInCache = s_cache->contains(resolvedPath); if (alreadyInCache) { // fast path when in cache // will be updated later if result has changed - const auto pair = s_cache->value(path); + const auto pair = s_cache->value(resolvedPath); Q_EMIT result(path, pair.first, pair.second); } -- 2.47.3