0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-608 Re-detect java when the binary goes missing

Browse Source
This commit is contained in:
Petr Mrázek 2014-11-16 12:56:33 +01:00
parent 6a09fd2898
commit 9ad9826d08
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui/MainWindow.cpp
View File

@ -1491,6 +1491,16 @@ void MainWindow::checkSetDefaultJava()
askForJava = true; askForJava = true;
break; break;
} }
if(!currentJavaPath.contains('/'))
{
currentJavaPath = QStandardPaths::findExecutable(currentJavaPath);
}
QFile currentJavaBin(currentJavaPath);
if(!currentJavaBin.exists())
{
askForJava = true;
break;
}
#if defined Q_OS_WIN32 #if defined Q_OS_WIN32
QString currentHack = MMC->settings()->get("JavaDetectionHack").toString(); QString currentHack = MMC->settings()->get("JavaDetectionHack").toString();
if (currentHack != javaHack) if (currentHack != javaHack)