GH-338, GH-513, GH-700 Unify edit instance with console window

* The resulting instance window can be closed at any point.
* Main window is kept open and running instances are marked with a badge.
* Multiple instances can now run from the same MultiMC - it's even more **multi** now.
* MultiMC can be entirely closed, keeping Minecraft(s) running.

1 files changed, 18 insertions, 15 deletions

diff --git a/application/LaunchInteraction.cpp b/application/LaunchInteraction.cpp
index 1caa054a..80a3368d 100644
--- a/application/LaunchInteraction.cpp
+++ b/application/LaunchInteraction.cpp
@@ -1,11 +1,12 @@
 #include "LaunchInteraction.h"
+#include "MainWindow.h"
 #include <minecraft/auth/MojangAccountList.h>
 #include "MultiMC.h"
 #include "dialogs/CustomMessageBox.h"
 #include "dialogs/AccountSelectDialog.h"
 #include "dialogs/ProgressDialog.h"
 #include "dialogs/EditAccountDialog.h"
-#include "ConsoleWindow.h"
+#include "InstanceWindow.h"
 #include "BuildConfig.h"
 #include "JavaCommon.h"
 #include "SettingsUI.h"
@@ -204,13 +205,20 @@ void LaunchController::launchInstance()
 		return;
 	}
 
-	if(m_parentWidget)
+	auto mainWindow = qobject_cast<MainWindow *>(m_parentWidget);
+	auto instanceWindow = qobject_cast<InstanceWindow *>(m_parentWidget);
+	if(mainWindow)
 	{
-		m_parentWidget->hide();
+		m_console = mainWindow->showInstanceWindow(m_instance);
+	}
+	else if(instanceWindow)
+	{
+		// NOOP
+	}
+	else
+	{
+		m_console = new InstanceWindow(m_instance);
 	}
-
-	m_console = new ConsoleWindow(m_launcher);
-	connect(m_console, &ConsoleWindow::isClosing, this, &LaunchController::instanceEnded);
 	connect(m_launcher.get(), &LaunchTask::readyForLaunch, this, &LaunchController::readyForLaunch);
 
 	m_launcher->prependStep(std::make_shared<TextPrint>(m_launcher.get(), "MultiMC version: " + BuildConfig.printableVersionString() + "\n\n", MessageLevel::MultiMC));
@@ -222,6 +230,7 @@ void LaunchController::readyForLaunch()
 	if (!m_profiler)
 	{
 		m_launcher->proceed();
+		emitSucceeded();
 		return;
 	}
 
@@ -230,6 +239,7 @@ void LaunchController::readyForLaunch()
 	{
 		m_launcher->abort();
 		QMessageBox::critical(m_parentWidget, tr("Error"), tr("Couldn't start profiler: %1").arg(error));
+		emitFailed("Profiler startup failed");
 		return;
 	}
 	BaseProfiler *profilerInstance = m_profiler->createProfiler(m_launcher->instance(), this);
@@ -246,6 +256,7 @@ void LaunchController::readyForLaunch()
 		msg.setModal(true);
 		msg.exec();
 		m_launcher->proceed();
+		emitSucceeded();
 	});
 	connect(profilerInstance, &BaseProfiler::abortLaunch, [this](const QString & message)
 	{
@@ -257,15 +268,7 @@ void LaunchController::readyForLaunch()
 		msg.setModal(true);
 		msg.exec();
 		m_launcher->abort();
+		emitFailed("Profiler startup failed");
 	});
 	profilerInstance->beginProfiling(m_launcher);
 }
-
-void LaunchController::instanceEnded()
-{
-	if(m_parentWidget)
-	{
-		m_parentWidget->show();
-	}
-	emitSucceeded();
-}