valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix restarting when in folder with spaces. Quotes aren't allowed on my system.

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3981
This commit is contained in:
Peter Veenstra 2016-05-03 17:58:44 +00:00
parent 2b32f2bfa9
commit 36f12b5670
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/sdlmain.cpp
View file

@ -1802,7 +1802,18 @@ void restart_program(std::vector<std::string> & parameters) {
DEBUG_ShutDown(NULL);
#endif
execvp(newargs[0], newargs);
if(execvp(newargs[0], newargs) == -1) {
#ifdef WIN32
if(newargs[0][0] == '\"') {
//everything specifies quotes around it if it contains a space, however my system disagrees
std::string edit = parameters[0];
edit.erase(0,1);edit.erase(edit.length() - 1,1);
//However keep the first argument of the passed argv (newargs) with quotes, as else repeated restarts go wrong.
if(execvp(edit.c_str(), newargs) == -1) E_Exit("Restarting failed");
}
#endif
E_Exit("Restarting failed");
}
free(newargs);
}
void Restart(bool pressed) { // mapper handler