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

3
logic/launch/steps/CheckJava.cpp
View File

@ -15,6 +15,7 @@
#include "CheckJava.h"
#include <launch/LaunchTask.h>
#include <pathutils.h>
#include <QStandardPaths>
#include <QFileInfo>
@ -22,7 +23,7 @@ void CheckJava::executeTask()
{
auto instance = m_parent->instance();
auto settings = instance->settings();
m_javaPath = settings->get("JavaPath").toString();
m_javaPath = ResolveExecutable(settings->get("JavaPath").toString());
bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool();
auto realJavaPath = QStandardPaths::findExecutable(m_javaPath);