Merge pull request #1298 from Holt59/fix-findfiles

Allow '.' in findFiles and filter on file name, not full paths.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index f57903e2..ef9c190f 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -959,13 +959,13 @@ QStringList OrganizerCore::findFiles(
 {
   QStringList result;
   DirectoryEntry *dir = m_DirectoryStructure;
-  if (!path.isEmpty())
+  if (!path.isEmpty() && path != ".")
     dir = dir->findSubDirectoryRecursive(ToWString(path));
   if (dir != nullptr) {
     std::vector<FileEntryPtr> files = dir->getFiles();
     for (FileEntryPtr &file: files) {
       QString fullPath = ToQString(file->getFullPath());
-      if (filter(fullPath)) {
+      if (filter(ToQString(file->getName()))) {
         result.append(fullPath);
       }
     }