diff options
| author | Stiepen22 <stiepen22@gmx.de> | 2013-09-06 22:40:50 +0200 |
|---|---|---|
| committer | Stiepen22 <stiepen22@gmx.de> | 2013-09-06 22:40:50 +0200 |
| commit | f897a200e2607fd99116a3ab4bb9ba757a52139b (patch) | |
| tree | 01e7448483a532173fffb44155909629695bb01a /logic | |
| parent | b44e70d58dac92a21d905565370357d296942209 (diff) | |
| download | MultiMC-f897a200e2607fd99116a3ab4bb9ba757a52139b.tar MultiMC-f897a200e2607fd99116a3ab4bb9ba757a52139b.tar.gz MultiMC-f897a200e2607fd99116a3ab4bb9ba757a52139b.tar.lz MultiMC-f897a200e2607fd99116a3ab4bb9ba757a52139b.tar.xz MultiMC-f897a200e2607fd99116a3ab4bb9ba757a52139b.zip | |
Made instace killing actually work
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/MinecraftProcess.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp index 3d82008b..6ac5b886 100644 --- a/logic/MinecraftProcess.cpp +++ b/logic/MinecraftProcess.cpp @@ -120,7 +120,12 @@ void MinecraftProcess::finish(int code, ExitStatus status) //TODO: error handling } - emit log("Minecraft exited."); + // TODO: Localization + + if (!killed) + emit log("Minecraft exited."); + else + emit log("Minecraft was killed by user.", MessageLevel::Error); m_prepostlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(code)); @@ -141,6 +146,7 @@ void MinecraftProcess::finish(int code, ExitStatus status) void MinecraftProcess::killMinecraft() { killed = true; + kill(); } void MinecraftProcess::launch() |