aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-26 08:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-10-10 18:55:28 +02:00
parent 2715eecda7
commit 35b59843cf
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/misc/path.cpp
View file

@ -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());

3
code/ryzom/tools/client/ryzom_installer/src/profile.cpp
View file

@ -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

4
code/ryzom/tools/client/ryzom_installer/src/utils.cpp
View file

@ -329,8 +329,8 @@ bool createShortcut(const QString &shortcut, const QString &name, const QString
QMap<QString, QString> 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;