From ac7b7add27849ec3e59acc055b3640187e03775e Mon Sep 17 00:00:00 2001 From: goeiecool9999 <> Date: Fri, 9 Sep 2022 10:44:53 +0200 Subject: [PATCH] Last PR introduced a bug --- src/Common/unix/FileStream_unix.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Common/unix/FileStream_unix.cpp b/src/Common/unix/FileStream_unix.cpp index 8eef914b..4c8c1d16 100644 --- a/src/Common/unix/FileStream_unix.cpp +++ b/src/Common/unix/FileStream_unix.cpp @@ -13,19 +13,20 @@ std::optional findPathCI(const fs::path& path) else return {}; } + std::string fName = path.filename().string(); - if (fs::exists(parentPath)) + + if (fs::exists(parentPath / fName)) + return parentPath / fName; + + std::error_code listErr; + for (auto&& dirEntry: fs::directory_iterator(parentPath, listErr)) { - std::error_code listErr; - for (auto&& dirEntry: fs::directory_iterator(parentPath, listErr)) + std::string dirFName = dirEntry.path().filename().string(); + if (boost::iequals(dirFName, fName)) { - std::string dirFName = dirEntry.path().filename().string(); - if (boost::iequals(dirFName, fName)) - { - return dirEntry; - } + return dirEntry; } - return fName; } return parentPath / fName; }