piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

AutoUpdater: support optionally restarting Dolphin after update

Browse Source
This commit is contained in:
Pierre Bourdon
2018-03-23 00:29:03 +01:00
parent 773ec975f3
commit 9628333b86
6 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Source/Core/Common/FileUtil.cpp
View File

@ -664,33 +664,42 @@ std::string GetBundleDirectory()
}
#endif
std::string& GetExeDirectory()
std::string GetExePath()
{
static std::string DolphinPath;
if (DolphinPath.empty())
static std::string dolphin_path;
if (dolphin_path.empty())
{
#ifdef _WIN32
TCHAR Dolphin_exe_Path[2048];
TCHAR Dolphin_exe_Clean_Path[MAX_PATH];
GetModuleFileName(nullptr, Dolphin_exe_Path, 2048);
if (_tfullpath(Dolphin_exe_Clean_Path, Dolphin_exe_Path, MAX_PATH) != nullptr)
DolphinPath = TStrToUTF8(Dolphin_exe_Clean_Path);
TCHAR dolphin_exe_path[2048];
TCHAR dolphin_exe_expanded_path[MAX_PATH];
GetModuleFileName(nullptr, dolphin_exe_path, ARRAYSIZE(dolphin_exe_path));
if (_tfullpath(dolphin_exe_expanded_path, dolphin_exe_path,
ARRAYSIZE(dolphin_exe_expanded_path)) != nullptr)
dolphin_path = TStrToUTF8(dolphin_exe_expanded_path);
else
DolphinPath = TStrToUTF8(Dolphin_exe_Path);
DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of('\\'));
dolphin_path = TStrToUTF8(dolphin_exe_path);
#else
char Dolphin_exe_Path[PATH_MAX];
ssize_t len = ::readlink("/proc/self/exe", Dolphin_exe_Path, sizeof(Dolphin_exe_Path));
if (len == -1 || len == sizeof(Dolphin_exe_Path))
char dolphin_exe_path[PATH_MAX];
ssize_t len = ::readlink("/proc/self/exe", dolphin_exe_path, sizeof(dolphin_exe_path));
if (len == -1 || len == sizeof(dolphin_exe_path))
{
len = 0;
}
Dolphin_exe_Path[len] = '\0';
DolphinPath = Dolphin_exe_Path;
DolphinPath = DolphinPath.substr(0, DolphinPath.rfind('/'));
dolphin_exe_path[len] = '\0';
dolphin_path = dolphin_exe_path;
#endif
}
return DolphinPath;
return dolphin_path;
}
std::string GetExeDirectory()
{
std::string exe_path = GetExePath();
#ifdef _WIN32
return exe_path.substr(0, exe_path.rfind('\\'));
#else
return exe_path.substr(0, exe_path.rfind('/'));
#endif
}
std::string GetSysDirectory()
@ -882,4 +891,4 @@ bool ReadFileToString(const std::string& filename, std::string& str)
return retval;
}
} // namespace
} // namespace File