dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/feature_raise_console' into develop

Browse source
This commit is contained in:
Petr Mrázek 2014-04-21 21:25:39 +02:00
commit c9465e9e86
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
MultiMC.cpp
View file

@ -412,6 +412,7 @@ void MultiMC::initGlobalSettings()
// Console // Console
m_settings->registerSetting("ShowConsole", true); m_settings->registerSetting("ShowConsole", true);
m_settings->registerSetting("RaiseConsole", true);
m_settings->registerSetting("AutoCloseConsole", true); m_settings->registerSetting("AutoCloseConsole", true);
m_settings->registerSetting("LogPrePostOutput", true); m_settings->registerSetting("LogPrePostOutput", true);

7
gui/ConsoleWindow.cpp
View file

@ -265,6 +265,13 @@ void ConsoleWindow::onEnded(BaseInstance *instance, int code, QProcess::ExitStat
*/ */
if (!isVisible()) if (!isVisible())
show(); show();
// Raise Window
if (MMC->settings()->get("RaiseConsole").toBool())
{
raise();
activateWindow();
}
} }
void ConsoleWindow::onLaunchFailed(BaseInstance *instance) void ConsoleWindow::onLaunchFailed(BaseInstance *instance)