From d9f1b642134692805452e9788ba8c2188f4cc61f Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Thu, 5 May 2011 21:39:52 +0200 Subject: [PATCH] some file collection bug fixing --- components/files/multidircollection.cpp | 4 ++-- components/files/multidircollection.hpp | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp index 0543312e0..4428b364e 100644 --- a/components/files/multidircollection.cpp +++ b/components/files/multidircollection.cpp @@ -41,9 +41,9 @@ namespace Files MultiDirCollection::MultiDirCollection (const std::vector& directories, const std::string& extension, bool foldCase) - : mFiles (NameLess (foldCase)) + : mFiles (NameLess (!foldCase)) { - NameEqual equal (foldCase); + NameEqual equal (!foldCase); for (std::vector::const_iterator iter = directories.begin(); iter!=directories.end(); ++iter) diff --git a/components/files/multidircollection.hpp b/components/files/multidircollection.hpp index 36270dfd1..bd0304e40 100644 --- a/components/files/multidircollection.hpp +++ b/components/files/multidircollection.hpp @@ -27,7 +27,9 @@ namespace Files char l = std::tolower (left[i]); char r = std::tolower (right[i]); - if (l>=r) + if (lr) return false; }