summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-04-21 21:25:39 +0200
committerPetr Mrázek <peterix@gmail.com>2014-04-21 21:25:39 +0200
commitc9465e9e864497e8fe1b97b2a776c48ccacad6d9 (patch)
tree884885ddc046be20f67d8a3e529e872d4f2c0b35 /gui
parentf14c1888a98f3bd6a83c8b0d035f12e6102aa1e1 (diff)
parent0959aeb046d53f966646f3bc7d0e44d344341ebe (diff)
downloadMultiMC-c9465e9e864497e8fe1b97b2a776c48ccacad6d9.tar
MultiMC-c9465e9e864497e8fe1b97b2a776c48ccacad6d9.tar.gz
MultiMC-c9465e9e864497e8fe1b97b2a776c48ccacad6d9.tar.lz
MultiMC-c9465e9e864497e8fe1b97b2a776c48ccacad6d9.tar.xz
MultiMC-c9465e9e864497e8fe1b97b2a776c48ccacad6d9.zip
Merge remote-tracking branch 'origin/feature_raise_console' into develop
Diffstat (limited to 'gui')
-rw-r--r--gui/ConsoleWindow.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp
index 621f035f..18a617e0 100644
--- a/gui/ConsoleWindow.cpp
+++ b/gui/ConsoleWindow.cpp
@@ -265,6 +265,13 @@ void ConsoleWindow::onEnded(BaseInstance *instance, int code, QProcess::ExitStat
*/
if (!isVisible())
show();
+
+ // Raise Window
+ if (MMC->settings()->get("RaiseConsole").toBool())
+ {
+ raise();
+ activateWindow();
+ }
}
void ConsoleWindow::onLaunchFailed(BaseInstance *instance)