Fix size of directories if a subdir fails to open

If opening the directory fails, it returns -1 as size. Don't add that to the
parent's total size.

(cherry picked from commit a6490755ca7d00c964a1349443ba9c06dbb33e50)

diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
index 9b86cd702a0177b47d138fd9d5fa7b9f6d5bb77d..2cbb58730b893316fb744c40bf5cd5779d294931 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
@@ -71,7 +71,10 @@ KDirectoryContentsCounterWorker::CountResult walkDir(const QString &dirPath,
                 }
                 if (dirEntry->d_type == DT_DIR) {
                     // recursion for dirs
-                    size += walkDir(nameBuf, countHiddenFiles, countDirectoriesOnly, dirEntry, allowedRecursiveLevel - 1).size;
+                    auto subdirResult = walkDir(nameBuf, countHiddenFiles, countDirectoriesOnly, dirEntry, allowedRecursiveLevel - 1);
+                    if (subdirResult.size > 0) {
+                        size += subdirResult.size;
+                    }
                 }
             }
         }