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

Check if the java binary can be found before launch.

Browse Source 
Fix #386
This commit is contained in:
Petr Mrázek 2014-07-23 00:12:18 +02:00
parent bef869ff76
commit 75cb329f17
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
logic/MinecraftProcess.cpp
View File

@ -24,6 +24,7 @@
#include <QDir> #include <QDir>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QRegularExpression> #include <QRegularExpression>
#include <QStandardPaths>
#include "BaseInstance.h" #include "BaseInstance.h"
@ -460,6 +461,14 @@ void MinecraftProcess::arm()
QString allArgs = args.join(", "); QString allArgs = args.join(", ");
emit log("Java Arguments:\n[" + censorPrivateInfo(allArgs) + "]\n\n"); emit log("Java Arguments:\n[" + censorPrivateInfo(allArgs) + "]\n\n");
auto realJavaPath = QStandardPaths::findExecutable(JavaPath);
if (realJavaPath.isEmpty())
{
emit log(tr("The java binary \"%1\" couldn't be found. You may have to set up java "
"if Minecraft fails to launch.").arg(JavaPath),
MessageLevel::Warning);
}
// instantiate the launcher part // instantiate the launcher part
start(JavaPath, args); start(JavaPath, args);
if (!waitForStarted()) if (!waitForStarted())