mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-11-20 17:11:57 +00:00
GH-1049 fix bad ifdefs that prevent linux-specific env blacklisting
This commit is contained in:
parent
6d7bff2476
commit
38e42ad794
@ -20,6 +20,8 @@
|
||||
#include <QDir>
|
||||
#include <QEventLoop>
|
||||
|
||||
#define IBUS "@im=ibus"
|
||||
|
||||
MessageLevel::Enum MessageLevel::getLevel(const QString& levelName)
|
||||
{
|
||||
if (levelName == "MultiMC")
|
||||
@ -82,7 +84,7 @@ void BaseProcess::init()
|
||||
qDebug() << "Env: ignoring" << key << value;
|
||||
continue;
|
||||
}
|
||||
#ifdef LINUX
|
||||
#ifdef Q_OS_LINUX
|
||||
// Do not pass LD_* variables to java. They were intended for MultiMC
|
||||
if(key.startsWith("LD_"))
|
||||
{
|
||||
@ -101,7 +103,7 @@ void BaseProcess::init()
|
||||
qDebug() << "Env: " << key << value;
|
||||
env.insert(key, value);
|
||||
}
|
||||
#ifdef LINUX
|
||||
#ifdef Q_OS_LINUX
|
||||
// HACK: Workaround for QTBUG-42500
|
||||
env.insert("LD_LIBRARY_PATH", "");
|
||||
#endif
|
||||
|
@ -31,8 +31,6 @@
|
||||
#include "pathutils.h"
|
||||
#include "cmdutils.h"
|
||||
|
||||
#define IBUS "@im=ibus"
|
||||
|
||||
// constructor
|
||||
MinecraftProcess::MinecraftProcess(MinecraftInstancePtr inst) : BaseProcess(inst)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user