mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-26 18:14:22 +00:00
Code Issues Projects Releases Wiki Activity

Make sure adding forced candidates doesn't result in duplicates

Browse Source
This commit is contained in:
Sky 2013-12-12 15:25:02 +00:00
parent b963ff7416
commit 808ca76363
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
logic/JavaUtils.cpp
View File

@ -153,9 +153,14 @@ QList<QString> JavaUtils::FindJavaPaths()
KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit"); KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
java_candidates.append(JRE64s); 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(JDK64s);
java_candidates.append(JRE32s); 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(JDK32s);
java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path));
QList<QString> candidates; QList<QString> candidates;
for(JavaVersionPtr java_candidate : java_candidates) for(JavaVersionPtr java_candidate : java_candidates)
@ -166,13 +171,6 @@ QList<QString> 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; return candidates;
} }