From b20688a18d57b43e90ae6f219eef34c5ffa99c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 1 May 2017 12:55:10 +0200
Subject: GH-1875 plug holes in instance/window refcount logic

---
 application/MultiMC.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'application/MultiMC.cpp')

diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index bac81f8f..833efc06 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -965,8 +965,8 @@ bool 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 ++;
+		controller->start();
 		return true;
 	}
 	else if (instance->isRunning())
@@ -1148,7 +1148,6 @@ void MultiMC::on_windowClose()
 		{
 			extras.controller->setParentWidget(m_mainWindow);
 		}
-		return;
 	}
 	auto mainWindow = qobject_cast<MainWindow *>(QObject::sender());
 	if(mainWindow)
-- 
cgit v1.2.3