CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1874 do not pass instance launch args to updated MultiMC

Browse Source
This commit is contained in:
Petr Mrázek
2017-05-01 16:53:20 +02:00
parent b20688a18d
commit 9bde1c8512
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/UpdateController.cpp
View File

@@ -273,8 +273,26 @@ void UpdateController::installUpdates()
} }
} }
// FIXME: reparse args and construct a safe variant from scratch. This is a workaround for GH-1874:
QStringList realargs;
int skip = 0;
for(auto & arg: args)
{
if(skip)
{
skip--;
continue;
}
if(arg == "-l")
{
skip = 1;
continue;
}
realargs.append(arg);
}
// start the updated application // start the updated application
started = QProcess::startDetached(finishCmd, args, QDir::currentPath(), &pid); started = QProcess::startDetached(finishCmd, realargs, QDir::currentPath(), &pid);
// much dumber check - just find out if the call // much dumber check - just find out if the call
if(!started || pid == -1) if(!started || pid == -1)
{ {