]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't return invalid size from wxDir::GetTotalSize() for empty dirs.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 17 Apr 2010 14:15:34 +0000 (14:15 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 17 Apr 2010 14:15:34 +0000 (14:15 +0000)
wxDirTraverserSumSize::GetTotalSize() may, and will, return 0 for empty
directories, this is not an error and so don't treat it as such.

Closes #11937.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/dircmn.cpp

index 89ec5076e27361ca934e250dd2a3aa43fa0f8d7c..79ce97e0a3814549c45cf619eac4b24ec838500a 100644 (file)
@@ -347,8 +347,7 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
         return wxInvalidSize;
 
     wxDirTraverserSumSize traverser;
-    if (dir.Traverse(traverser) == (size_t)-1 ||
-        traverser.GetTotalSize() == 0)
+    if (dir.Traverse(traverser) == (size_t)-1 )
         return wxInvalidSize;
 
     if (filesSkipped)