From 379af19bd921106be7b5a0e75f68ed128167ba97 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 28 Feb 2016 12:46:34 +0100
Subject: [PATCH] Merge with develop

---
 code/nel/src/misc/common.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp
index 55b8e0d62..d902cf47b 100644
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@@ -919,10 +919,12 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
 		// we need to open bundles with "open" command
 		std::string command = NLMISC::toString("open \"%s\"", programName.c_str());
 
+		std::string argumentsJoined = joinArguments(arguments);
+
 		// 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());
@@ -931,7 +933,7 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
 
 		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;