From 2102b9598e9dcbc63bbd03b9753fefcd201f58e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 9 Nov 2010 19:32:11 +0100 Subject: [PATCH] FileLister: fixed compiler errors in win32. accept all files given by user. --- lib/filelister_win32.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/filelister_win32.cpp b/lib/filelister_win32.cpp index 9e07e7fd9..565bd579b 100644 --- a/lib/filelister_win32.cpp +++ b/lib/filelister_win32.cpp @@ -168,16 +168,16 @@ void FileListerWin32::recursiveAddFiles(std::vector &filenames, con // File // If recursive is not used, accept all files given by user - if (!recursive || FileLister::acceptFile(ansiFfd)) + if (sameFileName(path,ansiFfd) || FileLister::acceptFile(ansiFfd)) { const std::string nativename = Path::fromNativeSeparators(fname.str()); filenames.push_back(nativename); } } - else if (recursive) + else { // Directory - getFileLister()->recursiveAddFiles(filenames, fname.str().c_str(), recursive); + getFileLister()->recursiveAddFiles(filenames, fname.str()); } #if defined(UNICODE) delete [] ansiFfd;