diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp index a3862feb9d..89ec5076e2 100644 --- a/src/common/dircmn.cpp +++ b/src/common/dircmn.cpp @@ -300,11 +300,11 @@ public: virtual wxDirTraverseResult OnFile(const wxString& filename) { - wxULongLong sz = wxFileName::GetSize(filename); - // wxFileName::GetSize won't use this class again as // we're passing it a file and not a directory; // thus we are sure to avoid an endless loop + wxULongLong sz = wxFileName::GetSize(filename); + if (sz == wxInvalidSize) { // if the GetSize() failed (this can happen because e.g. a @@ -327,7 +327,7 @@ public: wxULongLong GetTotalSize() const { return m_sz; } - wxArrayString &FilesSkipped() + const wxArrayString& GetSkippedFiles() const { return m_skippedFiles; } protected: @@ -352,7 +352,7 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki return wxInvalidSize; if (filesSkipped) - *filesSkipped = traverser.FilesSkipped(); + *filesSkipped = traverser.GetSkippedFiles(); return traverser.GetTotalSize(); }