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

GH-1049 fix bad ifdefs that prevent linux-specific env blacklisting

Browse Source
This commit is contained in:
Petr Mrázek 2015-06-08 23:54:30 +02:00
parent 6d7bff2476
commit 38e42ad794
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
logic/BaseProcess.cpp
View File

@ -20,6 +20,8 @@
#include <QDir> #include <QDir>
#include <QEventLoop> #include <QEventLoop>
#define IBUS "@im=ibus"
MessageLevel::Enum MessageLevel::getLevel(const QString& levelName) MessageLevel::Enum MessageLevel::getLevel(const QString& levelName)
{ {
if (levelName == "MultiMC") if (levelName == "MultiMC")
@ -82,7 +84,7 @@ void BaseProcess::init()
qDebug() << "Env: ignoring" << key << value; qDebug() << "Env: ignoring" << key << value;
continue; continue;
} }
#ifdef LINUX #ifdef Q_OS_LINUX
// Do not pass LD_* variables to java. They were intended for MultiMC // Do not pass LD_* variables to java. They were intended for MultiMC
if(key.startsWith("LD_")) if(key.startsWith("LD_"))
{ {
@ -101,7 +103,7 @@ void BaseProcess::init()
qDebug() << "Env: " << key << value; qDebug() << "Env: " << key << value;
env.insert(key, value); env.insert(key, value);
} }
#ifdef LINUX #ifdef Q_OS_LINUX
// HACK: Workaround for QTBUG-42500 // HACK: Workaround for QTBUG-42500
env.insert("LD_LIBRARY_PATH", ""); env.insert("LD_LIBRARY_PATH", "");
#endif #endif

2
logic/minecraft/MinecraftProcess.cpp
View File

@ -31,8 +31,6 @@
#include "pathutils.h" #include "pathutils.h"
#include "cmdutils.h" #include "cmdutils.h"
#define IBUS "@im=ibus"
// constructor // constructor
MinecraftProcess::MinecraftProcess(MinecraftInstancePtr inst) : BaseProcess(inst) MinecraftProcess::MinecraftProcess(MinecraftInstancePtr inst) : BaseProcess(inst)
{ {