From 35b59843cf8d8e934225dcd3aa790b6377cf364e Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 10 Oct 2016 18:55:28 +0200 Subject: [PATCH] Merge with develop --- code/nel/src/misc/path.cpp | 2 +- code/ryzom/tools/client/ryzom_installer/src/profile.cpp | 3 +++ code/ryzom/tools/client/ryzom_installer/src/utils.cpp | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/nel/src/misc/path.cpp b/code/nel/src/misc/path.cpp index 9737589f7..b9a49b04b 100644 --- a/code/nel/src/misc/path.cpp +++ b/code/nel/src/misc/path.cpp @@ -2148,7 +2148,7 @@ bool CFile::setFileModificationDate(const std::string &filename, uint32 modTime) FILETIME accessFileTime; FILETIME modFileTime; - // read the current the files times + // read the current file time if (GetFileTime(h, &creationFileTime, &accessFileTime, &modFileTime) == 0) { nlwarning("Can't set modification date on file '%s' : %s", fn.c_str(), formatErrorMessage(getLastError()).c_str()); diff --git a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp index 45800a203..79aa74b25 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/profile.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/profile.cpp @@ -145,6 +145,9 @@ bool CProfile::createClientConfig() const QString directory = getDirectory(); QString filename = directory + "/client.cfg"; + // create directory + QDir().mkpath(directory); + const CServer &s = CConfigFile::getInstance()->getServer(server); // create the 2 initial lines of client.cfg diff --git a/code/ryzom/tools/client/ryzom_installer/src/utils.cpp b/code/ryzom/tools/client/ryzom_installer/src/utils.cpp index de967b4f8..8fadb4610 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/utils.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/utils.cpp @@ -329,8 +329,8 @@ bool createShortcut(const QString &shortcut, const QString &name, const QString QMap strings; // build command - QString command = QString("open \"%1\"").arg(executable); - if (!arguments.isEmpty()) command += " --args " + arguments; + QString command = QString("exec \"%1\"").arg(executable); + if (!arguments.isEmpty()) command += " " + arguments; strings.clear(); strings["COMMAND"] = command;