Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
3ab030e359
3 changed files with 6 additions and 3 deletions
|
@ -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());
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue