From fc46e99862738827b54eac48c50d2dc9db183512 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Sun, 13 Jul 2014 21:48:55 +0200 Subject: [PATCH] look for JVM 1.8 first --- native/WinLauncher/WinLauncher/WinLauncher.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/native/WinLauncher/WinLauncher/WinLauncher.cpp b/native/WinLauncher/WinLauncher/WinLauncher.cpp index a934a88da3d0..3249a9a1f0de 100644 --- a/native/WinLauncher/WinLauncher/WinLauncher.cpp +++ b/native/WinLauncher/WinLauncher/WinLauncher.cpp @@ -169,12 +169,16 @@ bool FindJVMInRegistryWithVersion(const char* version, bool wow64_32) bool FindJVMInRegistry() { #ifndef _M_X64 + if (FindJVMInRegistryWithVersion("1.8", true)) + return true; if (FindJVMInRegistryWithVersion("1.7", true)) return true; if (FindJVMInRegistryWithVersion("1.6", true)) return true; #endif + if (FindJVMInRegistryWithVersion("1.8", false)) + return true; if (FindJVMInRegistryWithVersion("1.7", false)) return true; if (FindJVMInRegistryWithVersion("1.6", false))