diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-12 09:35:53 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-12 09:35:53 +0100 |
| commit | ee595fb1daa3c09215e3063321301e6746733662 (patch) | |
| tree | c4cee6d1c623d60bd51bc254649749824f36d539 /gui/ConsoleWindow.cpp | |
| parent | 997054a5351cd6187f578d2ac24df661027bf7cc (diff) | |
| parent | fdc58bb91360c04eed13a4fd4f8323a6a467dc37 (diff) | |
| download | MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.gz MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.lz MultiMC-ee595fb1daa3c09215e3063321301e6746733662.tar.xz MultiMC-ee595fb1daa3c09215e3063321301e6746733662.zip | |
Merge branch 'develop'
Diffstat (limited to 'gui/ConsoleWindow.cpp')
| -rw-r--r-- | gui/ConsoleWindow.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp index ec25b9cf..a3f294e6 100644 --- a/gui/ConsoleWindow.cpp +++ b/gui/ConsoleWindow.cpp @@ -122,14 +122,15 @@ void ConsoleWindow::on_btnKillMinecraft_clicked() ui->btnKillMinecraft->setEnabled(true); } -void ConsoleWindow::onEnded(BaseInstance *instance) +void ConsoleWindow::onEnded(BaseInstance* instance, int code, QProcess::ExitStatus status) { ui->btnKillMinecraft->setEnabled(false); - // TODO: Might need an option to forcefully close, even on an error if(instance->settings().get("AutoCloseConsole").toBool()) { - // TODO: Check why this doesn't work - if (!proc->exitCode()) this->close(); + if (code == 0 && status != QProcess::CrashExit) + { + this->close(); + } } } |