summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-12-11 12:26:23 +0000
committerSky <git@bunnies.cc>2013-12-11 12:26:23 +0000
commit35ec5997308ec48f45c3a8d6483bc83dc1c1ef09 (patch)
treeb3a02fbc2469f92f9ea979fa40c1231a22e9cf21 /gui
parent3e8e0dd639d68acddb7c96b89cc0ca5629a1942c (diff)
downloadMultiMC-35ec5997308ec48f45c3a8d6483bc83dc1c1ef09.tar
MultiMC-35ec5997308ec48f45c3a8d6483bc83dc1c1ef09.tar.gz
MultiMC-35ec5997308ec48f45c3a8d6483bc83dc1c1ef09.tar.lz
MultiMC-35ec5997308ec48f45c3a8d6483bc83dc1c1ef09.tar.xz
MultiMC-35ec5997308ec48f45c3a8d6483bc83dc1c1ef09.zip
Fix console window sticking open derp
Diffstat (limited to 'gui')
-rw-r--r--gui/ConsoleWindow.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp
index 1a0f352d..24afbc0a 100644
--- a/gui/ConsoleWindow.cpp
+++ b/gui/ConsoleWindow.cpp
@@ -165,6 +165,8 @@ void ConsoleWindow::onEnded(BaseInstance *instance, int code, QProcess::ExitStat
{
ui->btnKillMinecraft->setEnabled(false);
+ setMayClose(true);
+
if (instance->settings().get("AutoCloseConsole").toBool())
{
if (code == 0 && status != QProcess::CrashExit)
@@ -175,15 +177,16 @@ void ConsoleWindow::onEnded(BaseInstance *instance, int code, QProcess::ExitStat
}
if(!isVisible())
show();
- setMayClose(true);
}
void ConsoleWindow::onLaunchFailed(BaseInstance *instance)
{
ui->btnKillMinecraft->setEnabled(false);
+
+ setMayClose(true);
+
if(!isVisible())
show();
- setMayClose(true);
}
void ConsoleWindow::on_btnPaste_clicked()