citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4036 from zhaowenlan1779/port-yuzu-705 

Port "file_util: return string by const reference for GetExeDirectory()" from yuzu
This commit is contained in:
Merry 2018-07-30 12:10:35 +01:00 committed by GitHub
parent 71729fd47a 99b2a871a7
commit c4c158c6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/file_util.cpp
View File

@ -581,7 +581,7 @@ std::string GetBundleDirectory() {
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
std::string& GetExeDirectory() { const std::string& GetExeDirectory() {
static std::string exe_path; static std::string exe_path;
if (exe_path.empty()) { if (exe_path.empty()) {
wchar_t wchar_exe_path[2048]; wchar_t wchar_exe_path[2048];

2
src/common/file_util.h
View File

@ -133,7 +133,7 @@ std::string GetBundleDirectory();
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
std::string& GetExeDirectory(); const std::string& GetExeDirectory();
std::string AppDataRoamingDirectory(); std::string AppDataRoamingDirectory();
#endif #endif