mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

wxStandardPaths is protected as of wxgtk 2.9.5

Browse source 
Closes #1625, #1626, #1627.
This commit is contained in:
Maxime Gauduin 2013-08-12 05:20:41 +02:00 committed by Thomas Goyne
parent aa66bcd8b7
commit 0a2c0ab75e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/utils.cpp
View file

@ -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
} }