mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-14 03:09:08 +00:00
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 accessFileTime;
|
||||||
FILETIME modFileTime;
|
FILETIME modFileTime;
|
||||||
|
|
||||||
// read the current the files times
|
// read the current file time
|
||||||
if (GetFileTime(h, &creationFileTime, &accessFileTime, &modFileTime) == 0)
|
if (GetFileTime(h, &creationFileTime, &accessFileTime, &modFileTime) == 0)
|
||||||
{
|
{
|
||||||
nlwarning("Can't set modification date on file '%s' : %s", fn.c_str(), formatErrorMessage(getLastError()).c_str());
|
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 directory = getDirectory();
|
||||||
QString filename = directory + "/client.cfg";
|
QString filename = directory + "/client.cfg";
|
||||||
|
|
||||||
|
// create directory
|
||||||
|
QDir().mkpath(directory);
|
||||||
|
|
||||||
const CServer &s = CConfigFile::getInstance()->getServer(server);
|
const CServer &s = CConfigFile::getInstance()->getServer(server);
|
||||||
|
|
||||||
// create the 2 initial lines of client.cfg
|
// 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;
|
QMap<QString, QString> strings;
|
||||||
|
|
||||||
// build command
|
// build command
|
||||||
QString command = QString("open \"%1\"").arg(executable);
|
QString command = QString("exec \"%1\"").arg(executable);
|
||||||
if (!arguments.isEmpty()) command += " --args " + arguments;
|
if (!arguments.isEmpty()) command += " " + arguments;
|
||||||
|
|
||||||
strings.clear();
|
strings.clear();
|
||||||
strings["COMMAND"] = command;
|
strings["COMMAND"] = command;
|
||||||
|
|
Loading…
Reference in a new issue