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

Merge with develop

Browse source
This commit is contained in:
kervala 2016-02-28 12:46:34 +01:00
commit cad46d0e2c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -919,10 +919,12 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
// we need to open bundles with "open" command // we need to open bundles with "open" command
std::string command = NLMISC::toString("open \"%s\"", programName.c_str()); std::string command = NLMISC::toString("open \"%s\"", programName.c_str());
std::string argumentsJoined = joinArguments(arguments);
// append arguments if any // append arguments if any
if (!arguments.empty()) if (!argumentsJoined.empty())
{ {
command += NLMISC::toString(" --args %s", joinArguments(arguments).c_str()); command += NLMISC::toString(" --args %s", argumentsJoined.c_str());
} }
int res = system(command.c_str()); int res = system(command.c_str());
@ -931,7 +933,7 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
if (log) if (log)
{ {
nlwarning ("LAUNCH: Failed launched '%s' with arg '%s' return code %d", programName.c_str(), arguments.c_str(), res); nlwarning ("LAUNCH: Failed launched '%s' with arg '%s' return code %d", programName.c_str(), argumentsJoined.c_str(), res);
} }
return false; return false;