aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/launch
diff options
context:
space:
mode:
authorKenneth Chew <kenneth.c0@protonmail.com>2022-05-12 17:00:17 -0400
committerKenneth Chew <kenneth.c0@protonmail.com>2022-05-12 17:08:06 -0400
commit046f1e6e58b7a28f336bb2ed79995656fe66f0bf (patch)
tree5d580ec18f0fce3af1510aa5343881b07f722131 /launcher/minecraft/launch
parent649b8ac7c6e12fcf91d204f908e027d3bfbb6a2a (diff)
downloadPrismLauncher-046f1e6e58b7a28f336bb2ed79995656fe66f0bf.tar.gz
PrismLauncher-046f1e6e58b7a28f336bb2ed79995656fe66f0bf.tar.bz2
PrismLauncher-046f1e6e58b7a28f336bb2ed79995656fe66f0bf.zip
Add instance overrides for miscellaneous settings
Diffstat (limited to 'launcher/minecraft/launch')
-rw-r--r--launcher/minecraft/launch/LauncherPartLaunch.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp
index 173f29b5..d7010355 100644
--- a/launcher/minecraft/launch/LauncherPartLaunch.cpp
+++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp
@@ -25,7 +25,8 @@
LauncherPartLaunch::LauncherPartLaunch(LaunchTask *parent) : LaunchStep(parent)
{
- if (APPLICATION->settings()->get("CloseAfterLaunch").toBool())
+ auto instance = parent->instance();
+ if (instance->settings()->get("CloseAfterLaunch").toBool())
{
std::shared_ptr<QMetaObject::Connection> connection{new QMetaObject::Connection};
*connection = connect(&m_process, &LoggedProcess::log, this, [=](QStringList lines, MessageLevel::Enum level) {
@@ -168,7 +169,8 @@ void LauncherPartLaunch::on_state(LoggedProcess::State state)
}
case LoggedProcess::Finished:
{
- if (APPLICATION->settings()->get("CloseAfterLaunch").toBool())
+ auto instance = m_parent->instance();
+ if (instance->settings()->get("CloseAfterLaunch").toBool())
APPLICATION->showMainWindow();
m_parent->setPid(-1);