Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Unable to open URLs under Linux while using Steam Runtime

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-11-21 17:39:49 +01:00
parent 35471ace88
commit d50c40c473
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/nel/src/misc/common.cpp
View file

@ -769,6 +769,12 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
} }
argv[i+1] = NULL; argv[i+1] = NULL;
// save LD_LIBRARY_PATH
const char *previousEnv = getenv("LD_LIBRARY_PATH");
// clear LD_LIBRARY_PATH to avoid problems with Steam Runtime
setenv("LD_LIBRARY_PATH", "", 1);
int status = vfork (); int status = vfork ();
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
/// WARNING : NO MORE INSTRUCTION AFTER VFORK ! /// WARNING : NO MORE INSTRUCTION AFTER VFORK !
@ -779,10 +785,12 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
char *err = strerror (errno); char *err = strerror (errno);
if (log) if (log)
nlwarning("LAUNCH: Failed launched '%s' with arg '%s' err %d: '%s'", programName.c_str(), arguments.c_str(), errno, err); nlwarning("LAUNCH: Failed launched '%s' with arg '%s' err %d: '%s'", programName.c_str(), arguments.c_str(), errno, err);
// restore previous LD_LIBRARY_PATH
setenv("LD_LIBRARY_PATH", previousEnv, 1);
} }
else if (status == 0) else if (status == 0)
{ {
// Exec (the only allowed instruction after vfork) // Exec (the only allowed instruction after vfork)
status = execvp(programName.c_str(), &argv.front()); status = execvp(programName.c_str(), &argv.front());
@ -795,6 +803,10 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
else else
{ {
//nldebug("LAUNCH: Successful launch '%s' with arg '%s'", programName.c_str(), arguments.c_str()); //nldebug("LAUNCH: Successful launch '%s' with arg '%s'", programName.c_str(), arguments.c_str());
// restore previous LD_LIBRARY_PATH
setenv("LD_LIBRARY_PATH", previousEnv, 1);
return true; return true;
} }
#else #else