From 1276ecdbb769a249a969e8d34749b8f245c3031e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 6 Nov 2016 23:01:08 +0100 Subject: NOISSUE ask user if closing is OK when instances are still running --- application/MultiMC.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'application/MultiMC.cpp') diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index c6ac2b63..3c637077 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -1104,6 +1104,7 @@ void MultiMC::launch(InstancePtr instance, bool online, BaseProfilerFactory *pro connect(controller.get(), &LaunchController::succeeded, this, &MultiMC::controllerSucceeded); connect(controller.get(), &LaunchController::failed, this, &MultiMC::controllerFailed); controller->start(); + m_runningInstances ++; } else if (instance->isRunning()) { @@ -1118,6 +1119,7 @@ void MultiMC::controllerSucceeded() return; auto id = controller->id(); auto & extras = m_instanceExtras[id]; + // on success, do... if (controller->instance()->settings()->get("AutoCloseConsole").toBool()) { @@ -1127,8 +1129,10 @@ void MultiMC::controllerSucceeded() } } extras.controller.reset(); + m_runningInstances --; + // quit when there are no more windows. - if(m_openWindows == 0) + if(m_openWindows == 0 && m_runningInstances == 0) { m_status = Status::Succeeded; quit(); @@ -1146,8 +1150,10 @@ void MultiMC::controllerFailed(const QString& error) // on failure, do... nothing extras.controller.reset(); + m_runningInstances --; + // quit when there are no more windows. - if(m_openWindows == 0) + if(m_openWindows == 0 && m_runningInstances == 0) { m_status = Status::Failed; quit(); -- cgit v1.2.3