From bc917668ff9ab193ed66b390dd4f0e0bcef4cb43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 24 Aug 2015 00:56:45 +0200
Subject: GH-1133 fix bad java path detection some more

---
 logic/minecraft/LegacyInstance.cpp | 5 +++++
 logic/minecraft/OneSixInstance.cpp | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'logic/minecraft')

diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp
index 782135eb..9dd50c80 100644
--- a/logic/minecraft/LegacyInstance.cpp
+++ b/logic/minecraft/LegacyInstance.cpp
@@ -31,6 +31,7 @@
 #include <launch/steps/Update.h>
 #include <launch/steps/PreLaunchCommand.h>
 #include <launch/steps/TextPrint.h>
+#include <launch/steps/CheckJava.h>
 #include "minecraft/ModList.h"
 #include <MMCZip.h>
 
@@ -136,6 +137,10 @@ std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr sess
 	{
 		process->appendStep(std::make_shared<TextPrint>(pptr, "Minecraft folder is:\n" + minecraftRoot() + "\n\n", MessageLevel::MultiMC));
 	}
+	{
+		auto step = std::make_shared<CheckJava>(pptr);
+		process->appendStep(step);
+	}
 	// run pre-launch command if that's needed
 	if(getPreLaunchCommand().size())
 	{
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp
index 9a7ef99b..6cea55d2 100644
--- a/logic/minecraft/OneSixInstance.cpp
+++ b/logic/minecraft/OneSixInstance.cpp
@@ -29,6 +29,7 @@
 #include <launch/steps/PostLaunchCommand.h>
 #include <launch/steps/TextPrint.h>
 #include <launch/steps/ModMinecraftJar.h>
+#include <launch/steps/CheckJava.h>
 #include "minecraft/OneSixProfileStrategy.h"
 #include "MMCZip.h"
 
@@ -243,6 +244,10 @@ std::shared_ptr<LaunchTask> OneSixInstance::createLaunchTask(AuthSessionPtr sess
 	{
 		process->appendStep(std::make_shared<TextPrint>(pptr, "Minecraft folder is:\n" + minecraftRoot() + "\n\n", MessageLevel::MultiMC));
 	}
+	{
+		auto step = std::make_shared<CheckJava>(pptr);
+		process->appendStep(step);
+	}
 	// run pre-launch command if that's needed
 	if(getPreLaunchCommand().size())
 	{
-- 
cgit v1.2.3