diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-06-28 00:05:00 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-28 00:05:00 +0200 |
| commit | f0d850e1ee299ecdb19c2d02e24e83a2a167bcc1 (patch) | |
| tree | edf88275fa39bdecbeabbb728f0698dafacf7e7f /logic | |
| parent | c31dbf13cb072cc50b63e2304b6857bf41719a39 (diff) | |
| download | MultiMC-f0d850e1ee299ecdb19c2d02e24e83a2a167bcc1.tar MultiMC-f0d850e1ee299ecdb19c2d02e24e83a2a167bcc1.tar.gz MultiMC-f0d850e1ee299ecdb19c2d02e24e83a2a167bcc1.tar.lz MultiMC-f0d850e1ee299ecdb19c2d02e24e83a2a167bcc1.tar.xz MultiMC-f0d850e1ee299ecdb19c2d02e24e83a2a167bcc1.zip | |
Fix issues with intel drivers. Forced java re-detection on Windows.
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/JavaUtils.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp index 3a3046bd..707a8bc5 100644 --- a/logic/JavaUtils.cpp +++ b/logic/JavaUtils.cpp @@ -124,7 +124,7 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString javaVersion->id = subKeyName; javaVersion->arch = archType; javaVersion->path = - QDir(PathCombine(value, "bin")).absoluteFilePath("java.exe"); + QDir(PathCombine(value, "bin")).absoluteFilePath("javaw.exe"); javas.append(javaVersion); } @@ -154,12 +154,12 @@ QList<QString> 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(MakeJavaPtr("C:/Program Files/Java/jre7/bin/javaw.exe")); + java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/javaw.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(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/javaw.exe")); + java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/javaw.exe")); java_candidates.append(JDK32s); java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path)); |