Fix DirectoryIterator when multiple wildcards are used.

This commit is contained in:
Vinnie Falco
2013-08-19 11:29:58 -07:00
parent ac9c02f73b
commit b09e975b4c

View File

@@ -104,8 +104,8 @@ bool DirectoryIterator::next (bool* const isDirResult, bool* const isHiddenResul
matches = (whatToLookFor & File::findFiles) != 0;
}
// if recursive, we're not relying on the OS iterator to do the wildcard match, so do it now..
if (matches && isRecursive)
// if we're not relying on the OS iterator to do the wildcard match, do it now..
if (matches && (isRecursive || wildCards.size() > 1))
matches = fileMatches (wildCards, filename);
if (matches && (whatToLookFor & File::ignoreHiddenFiles) != 0)