GH-1262 fix relative paths for java binaries
This commit is contained in:
parent
cf0308c970
commit
477a1a88c6
7 changed files with 65 additions and 20 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue