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

GH-1355 do not allow setting LD_LIBRARY_PATh for Minecraft to the MultiMC bin folder

Browse Source
This commit is contained in:
Petr Mrázek 2015-12-18 05:43:44 +01:00
parent 2db4a595dd
commit 478ff11485
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
logic/minecraft/MinecraftInstance.cpp
View File

@ -132,6 +132,24 @@ QMap<QString, QString> MinecraftInstance::getVariables() const
return out; return out;
} }
static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
{
QDir mmcBin(QCoreApplication::applicationDirPath());
auto items = LD_LIBRARY_PATH.split(':');
QStringList final;
for(auto & item: items)
{
QDir test(item);
if(test == mmcBin)
{
qDebug() << "Env:LD_LIBRARY_PATH ignoring path" << item;
continue;
}
final.append(item);
}
return final.join(':');
}
QProcessEnvironment MinecraftInstance::createEnvironment() QProcessEnvironment MinecraftInstance::createEnvironment()
{ {
// prepare the process environment // prepare the process environment
@ -186,7 +204,7 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
} }
if(key == "GAME_LIBRARY_PATH") if(key == "GAME_LIBRARY_PATH")
{ {
env.insert("LD_LIBRARY_PATH", value); env.insert("LD_LIBRARY_PATH", processLD_LIBRARY_PATH(value));
continue; continue;
} }
#endif #endif