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 /logic/launch/steps/LaunchMinecraft.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 'logic/launch/steps/LaunchMinecraft.cpp')
| -rw-r--r-- | logic/launch/steps/LaunchMinecraft.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/logic/launch/steps/LaunchMinecraft.cpp b/logic/launch/steps/LaunchMinecraft.cpp index 95438003..84abb375 100644 --- a/logic/launch/steps/LaunchMinecraft.cpp +++ b/logic/launch/steps/LaunchMinecraft.cpp @@ -16,6 +16,7 @@ #include "LaunchMinecraft.h" #include <launch/LaunchTask.h> #include <minecraft/OneSixInstance.h> +#include <pathutils.h> #include <QStandardPaths> LaunchMinecraft::LaunchMinecraft(LaunchTask *parent) : LaunchStep(parent) @@ -33,7 +34,7 @@ void LaunchMinecraft::executeTask() QString allArgs = args.join(", "); emit logLine("Java Arguments:\n[" + m_parent->censorPrivateInfo(allArgs) + "]\n\n", MessageLevel::MultiMC); - auto javaPath = instance->settings()->get("JavaPath").toString(); + auto javaPath = ResolveExecutable(instance->settings()->get("JavaPath").toString()); m_process.setProcessEnvironment(instance->createEnvironment()); |