0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for invalid prelaunch commands

Browse Source
This commit is contained in:
Petr Mrázek 2014-04-01 00:04:26 +02:00
parent 29b00eab31
commit 72bc860983
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
logic/MinecraftProcess.cpp
View File

@ -280,6 +280,7 @@ bool MinecraftProcess::preLaunch()
m_prepostlaunchprocess.start(prelaunch_cmd); m_prepostlaunchprocess.start(prelaunch_cmd);
if (!waitForPrePost()) if (!waitForPrePost())
{ {
emit log(tr("The command failed to start"), MessageLevel::Fatal);
return false; return false;
} }
// Flush console window // Flush console window
@ -352,7 +353,8 @@ bool MinecraftProcess::postLaunch()
bool MinecraftProcess::waitForPrePost() bool MinecraftProcess::waitForPrePost()
{ {
m_prepostlaunchprocess.waitForStarted(); if(!m_prepostlaunchprocess.waitForStarted())
return false;
QEventLoop eventLoop; QEventLoop eventLoop;
auto finisher = [this, &eventLoop](QProcess::ProcessState state) auto finisher = [this, &eventLoop](QProcess::ProcessState state)
{ {
@ -435,6 +437,7 @@ void MinecraftProcess::arm()
if (!preLaunch()) if (!preLaunch())
{ {
emit ended(m_instance, 1, QProcess::CrashExit);
return; return;
} }