Fix a few bugs in profilers.

* Legacy was launching before the profiler.
* Some clarity changes.
* Report problem with empty strings as profiler paths.

3 files changed, 27 insertions, 3 deletions

diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp
index a9f0d112..6cd17fea 100644
--- a/logic/LegacyInstance.cpp
+++ b/logic/LegacyInstance.cpp
@@ -77,7 +77,7 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(AuthSessionPtr account)
 		launchScript += "windowTitle " + windowTitle() + "\n";
 		launchScript += "windowParams " + windowParams + "\n";
 		launchScript += "lwjgl " + lwjgl + "\n";
-		launchScript += "launch legacy\n";
+		launchScript += "launcher legacy\n";
 	}
 	proc->setLaunchScript(launchScript);
 
diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp
index 70a9d55f..89cd71ed 100644
--- a/logic/MinecraftProcess.cpp
+++ b/logic/MinecraftProcess.cpp
@@ -288,7 +288,7 @@ void MinecraftProcess::killMinecraft()
 	kill();
 }
 
-void MinecraftProcess::launch()
+void MinecraftProcess::arm()
 {
 	emit log("MultiMC version: " + MMC->version().toString() + "\n\n");
 	emit log("Minecraft folder is:\n" + workingDirectory() + "\n\n");
@@ -374,3 +374,17 @@ void MinecraftProcess::launch()
 	QByteArray bytes = launchScript.toUtf8();
 	writeData(bytes.constData(), bytes.length());
 }
+
+void MinecraftProcess::launch()
+{
+	QString launchString("launch\n");
+	QByteArray bytes = launchString.toUtf8();
+	writeData(bytes.constData(), bytes.length());
+}
+
+void MinecraftProcess::abort()
+{
+	QString launchString("abort\n");
+	QByteArray bytes = launchString.toUtf8();
+	writeData(bytes.constData(), bytes.length());
+}
diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h
index 26214026..56340962 100644
--- a/logic/MinecraftProcess.h
+++ b/logic/MinecraftProcess.h
@@ -55,10 +55,20 @@ public:
 	MinecraftProcess(BaseInstance *inst);
 
 	/**
-	 * @brief launch minecraft
+	 * @brief start the launcher part with the provided launch script
+	 */
+	void arm();
+
+	/**
+	 * @brief launch the armed instance!
 	 */
 	void launch();
 
+	/**
+	 * @brief abort launch!
+	 */
+	void abort();
+
 	BaseInstance *instance()
 	{
 		return m_instance;