diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-09-30 22:52:55 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-09-30 22:52:55 +0200 |
| commit | 477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525 (patch) | |
| tree | 8afd9d2359717b77c9c842b27598543af9069471 /application/MainWindow.cpp | |
| parent | cf0308c970aba7e282e4e98782187bc636f8ce26 (diff) | |
| download | MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar.gz MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar.lz MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.tar.xz MultiMC-477a1a88c6b7f5e5a78a2bbc4a6fe7781b2a0525.zip | |
GH-1262 fix relative paths for java binaries
Diffstat (limited to 'application/MainWindow.cpp')
| -rw-r--r-- | application/MainWindow.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index ecf0f371..1562efc5 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -1677,17 +1677,8 @@ void MainWindow::checkSetDefaultJava() break; } QString currentJavaPath = MMC->settings()->get("JavaPath").toString(); - if (currentJavaPath.isEmpty()) - { - askForJava = true; - break; - } - if(!currentJavaPath.contains('/')) - { - currentJavaPath = QStandardPaths::findExecutable(currentJavaPath); - } - QFile currentJavaBin(currentJavaPath); - if(!currentJavaBin.exists()) + QString actualPath = ResolveExecutable(currentJavaPath); + if (currentJavaPath.isNull()) { askForJava = true; break; |