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

Fix console not staying open on minecraft crash

Browse Source
This commit is contained in:
Petr Mrázek
2013-11-12 09:23:39 +01:00
parent e611aef0e7
commit fdc58bb913
6 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
logic/MinecraftProcess.cpp
View File

@ -111,19 +111,24 @@ void MinecraftProcess::on_stdOut()
// exit handler
void MinecraftProcess::finish(int code, ExitStatus status)
{
if (status != NormalExit)
{
// TODO: error handling
}
// TODO: Localization
if (!killed)
//: Message displayed on instance exit
emit log(tr("Minecraft exited with exitcode %1.").arg(status));
{
if (status == NormalExit)
{
//: Message displayed on instance exit
emit log(tr("Minecraft exited with exitcode %1.").arg(code));
}
else
{
//: Message displayed on instance crashed
emit log(tr("Minecraft crashed with exitcode %1.").arg(code));
}
}
else
{
//: Message displayed after the instance exits due to kill request
emit log(tr("Minecraft was killed by user."), MessageLevel::Error);
}
m_prepostlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(code));
@ -138,7 +143,7 @@ void MinecraftProcess::finish(int code, ExitStatus status)
}
}
m_instance->cleanupAfterRun();
emit ended(m_instance);
emit ended(m_instance, code, status);
}
void MinecraftProcess::killMinecraft()

2
logic/MinecraftProcess.h
View File

@ -74,7 +74,7 @@ signals:
/**
* @brief emitted when mc has finished and the PostLaunchCommand was run
*/
void ended(BaseInstance *);
void ended(BaseInstance *, int code, ExitStatus status);
/**
* @brief emitted when we want to log something