From 706c810a3a45063259836347cf74090c540c58c9 Mon Sep 17 00:00:00 2001 From: gibbed Date: Thu, 18 Jul 2019 18:31:21 -0500 Subject: [PATCH] [Base] Fix find_base_path returning original string with no separator is found. --- src/xenia/base/string.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xenia/base/string.cc b/src/xenia/base/string.cc index 54a8d7ebf..ded97ffa5 100644 --- a/src/xenia/base/string.cc +++ b/src/xenia/base/string.cc @@ -262,7 +262,7 @@ std::wstring find_name_from_path(const std::wstring& path, wchar_t sep) { std::string find_base_path(const std::string& path, char sep) { auto last_slash = path.find_last_of(sep); if (last_slash == std::string::npos) { - return path; + return ""; } else if (last_slash == path.length() - 1) { auto prev_slash = path.find_last_of(sep, last_slash - 1); if (prev_slash == std::string::npos) { @@ -278,7 +278,7 @@ std::string find_base_path(const std::string& path, char sep) { std::wstring find_base_path(const std::wstring& path, wchar_t sep) { auto last_slash = path.find_last_of(sep); if (last_slash == std::wstring::npos) { - return path; + return L""; } else if (last_slash == path.length() - 1) { auto prev_slash = path.find_last_of(sep, last_slash - 1); if (prev_slash == std::wstring::npos) {