From 808ca763632090abdab5a2451c95dbb0f4319126 Mon Sep 17 00:00:00 2001 From: Sky Date: Thu, 12 Dec 2013 15:25:02 +0000 Subject: Make sure adding forced candidates doesn't result in duplicates --- logic/JavaUtils.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'logic') diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp index 278046e9..e1b3bc64 100644 --- a/logic/JavaUtils.cpp +++ b/logic/JavaUtils.cpp @@ -153,9 +153,14 @@ QList JavaUtils::FindJavaPaths() KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit"); java_candidates.append(JRE64s); + java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre7/bin/java.exe")); + java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/java.exe")); java_candidates.append(JDK64s); java_candidates.append(JRE32s); + java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/java.exe")); + java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/java.exe")); java_candidates.append(JDK32s); + java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path)); QList candidates; for(JavaVersionPtr java_candidate : java_candidates) @@ -166,13 +171,6 @@ QList JavaUtils::FindJavaPaths() } } - candidates.append("C:/Program Files/Java/jre7/bin/java.exe"); - candidates.append("C:/Program Files/Java/jre6/bin/java.exe"); - candidates.append("C:/Program Files (x86)/Java/jre7/bin/java.exe"); - candidates.append("C:/Program Files (x86)/Java/jre6/bin/java.exe"); - - candidates.append(this->GetDefaultJava()->path); - return candidates; } -- cgit v1.2.3