From ff2bb04474f114b02b76160db04648e2bd605831 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 18 Oct 2016 10:33:11 +0200
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/src/login_patch.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 02aa2fbd1..0afbdf5f4 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -948,7 +948,12 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
 			contentSuffix += "cd \"$STARTUPPATH\"\n\n";
 
 			// launch new client
+#ifdef NL_OS_MAC
+			// use exec command under OS X
+			contentSuffix += toString("exec \"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
+#else
 			contentSuffix += toString("\"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
+#endif
 		}
 #endif