From d8caab515aa641ec901592d40b5d30c6dfd282f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 26 Jul 2015 17:55:29 +0200
Subject: GH-1053 add back update progress dialog

---
 logic/minecraft/LegacyInstance.cpp | 4 ++--
 logic/minecraft/LegacyUpdate.cpp   | 3 ++-
 logic/minecraft/OneSixInstance.cpp | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'logic/minecraft')

diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp
index 4648ce59..ed0b1001 100644
--- a/logic/minecraft/LegacyInstance.cpp
+++ b/logic/minecraft/LegacyInstance.cpp
@@ -25,7 +25,7 @@
 #include "minecraft/LegacyUpdate.h"
 #include "icons/IconList.h"
 #include "launch/LaunchTask.h"
-#include <launch/steps/LaunchCommand.h>
+#include <launch/steps/LaunchMinecraft.h>
 #include <launch/steps/PostLaunchCommand.h>
 #include <launch/steps/ModMinecraftJar.h>
 #include <launch/steps/Update.h>
@@ -156,7 +156,7 @@ std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr sess
 	}
 	// actually launch the game
 	{
-		auto step = std::make_shared<LaunchCommand>(pptr);
+		auto step = std::make_shared<LaunchMinecraft>(pptr);
 		step->setWorkingDirectory(minecraftRoot());
 		step->setLaunchScript(launchScript);
 		process->appendStep(step);
diff --git a/logic/minecraft/LegacyUpdate.cpp b/logic/minecraft/LegacyUpdate.cpp
index e136deec..c48984c4 100644
--- a/logic/minecraft/LegacyUpdate.cpp
+++ b/logic/minecraft/LegacyUpdate.cpp
@@ -24,7 +24,8 @@
 #include "net/URLConstants.h"
 #include "MMCZip.h"
 
-#include "minecraft/LegacyUpdate.h"
+#include "LegacyUpdate.h"
+
 #include "minecraft/LwjglVersionList.h"
 #include "minecraft/MinecraftVersionList.h"
 #include "minecraft/ModList.h"
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp
index 5e2f5c64..3b2ff750 100644
--- a/logic/minecraft/OneSixInstance.cpp
+++ b/logic/minecraft/OneSixInstance.cpp
@@ -25,7 +25,7 @@
 #include "launch/LaunchTask.h"
 #include <launch/steps/PreLaunchCommand.h>
 #include <launch/steps/Update.h>
-#include <launch/steps/LaunchCommand.h>
+#include <launch/steps/LaunchMinecraft.h>
 #include <launch/steps/PostLaunchCommand.h>
 #include <launch/steps/TextPrint.h>
 #include <launch/steps/ModMinecraftJar.h>
@@ -263,7 +263,7 @@ std::shared_ptr<LaunchTask> OneSixInstance::createLaunchTask(AuthSessionPtr sess
 	}
 	// actually launch the game
 	{
-		auto step = std::make_shared<LaunchCommand>(pptr);
+		auto step = std::make_shared<LaunchMinecraft>(pptr);
 		step->setWorkingDirectory(minecraftRoot());
 		step->setLaunchScript(launchScript);
 		process->appendStep(step);
-- 
cgit v1.2.3