CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1262 fix relative paths for java binaries

Browse Source
This commit is contained in:
Petr Mrázek
2015-09-30 22:52:55 +02:00
parent cf0308c970
commit 477a1a88c6
7 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/MainWindow.cpp
View File

@ -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;