mirror of https://github.com/odrling/Aegisub
wxStandardPaths is protected as of wxgtk 2.9.5
Closes #1625, #1626, #1627.
This commit is contained in:
parent
aa66bcd8b7
commit
0a2c0ab75e
|
@ -121,8 +121,7 @@ void RestartAegisub() {
|
||||||
config::opt->Flush();
|
config::opt->Flush();
|
||||||
|
|
||||||
#if defined(__WXMSW__)
|
#if defined(__WXMSW__)
|
||||||
wxStandardPaths stand;
|
wxExecute("\"" + wxStandardPaths::Get().GetExecutablePath() + "\"");
|
||||||
wxExecute("\"" + stand.GetExecutablePath() + "\"");
|
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
std::string bundle_path = agi::util::OSX_GetBundlePath();
|
std::string bundle_path = agi::util::OSX_GetBundlePath();
|
||||||
std::string helper_path = agi::util::OSX_GetBundleAuxillaryExecutablePath("restart-helper");
|
std::string helper_path = agi::util::OSX_GetBundleAuxillaryExecutablePath("restart-helper");
|
||||||
|
@ -132,8 +131,7 @@ void RestartAegisub() {
|
||||||
LOG_I("util/restart/exec") << exec;
|
LOG_I("util/restart/exec") << exec;
|
||||||
wxExecute(exec);
|
wxExecute(exec);
|
||||||
#else
|
#else
|
||||||
wxStandardPaths stand;
|
wxExecute(wxStandardPaths::Get().GetExecutablePath());
|
||||||
wxExecute(stand.GetExecutablePath());
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue