summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Src/FileSearch.cpp
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2010-01-13 21:09:31 +0000
committerShawn Hoffman <godisgovernment@gmail.com>2010-01-13 21:09:31 +0000
commitdd01e0d41766965f0663fbbf4ae51f4473f7cfa6 (patch)
treec49cc5951222a729e40d15f64e59983aee1b78a9 /Source/Core/Common/Src/FileSearch.cpp
parent5aac8a5437a8b3a3df33a10de6b03418358958e1 (diff)
commit patch from http://forums.dolphin-emu.com/thread-6527.html fixes the "Purge Cache" in the "View" menu, maybe other things.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4827 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/FileSearch.cpp')
-rw-r--r--Source/Core/Common/Src/FileSearch.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp
index 363f578e24..94ae687821 100644
--- a/Source/Core/Common/Src/FileSearch.cpp
+++ b/Source/Core/Common/Src/FileSearch.cpp
@@ -101,11 +101,12 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string&
if ( (s.size() > ext.size()) && (!strcasecmp(s.substr(s.size() - ext.size()).c_str(), ext.c_str())) )
{
-#ifdef __APPLE__
- std::string full_name = _strPath + s;
-#else
- std::string full_name = _strPath + "/" + s;
-#endif
+ std::string full_name;
+ if (_strPath.c_str()[_strPath.size()-1] == DIR_SEP_CHR)
+ full_name = _strPath + s;
+ else
+ full_name = _strPath + DIR_SEP + s;
+
m_FileNames.push_back(full_name);
}
}