Merge with develop

This commit is contained in:
kervala 2016-02-27 19:23:14 +01:00
parent 9206121963
commit 982c1f402b

View file

@ -977,7 +977,7 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
{
char *err = strerror (errno);
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(), joinArguments(arguments).c_str(), errno, err);
}
else if (status == 0)
{