Merge 1.4.1 r601:602 into trunk
This commit is contained in:
parent
b62582444e
commit
351818a4db
|
@ -83,7 +83,7 @@ void AppConfig::loadSettings()
|
|||
m_Interface = settings().value("interface").toString();
|
||||
m_LogLevel = settings().value("logLevel", 2).toInt();
|
||||
m_AutoDetectPaths = settings().value("autoDetectPaths", true).toBool();
|
||||
m_LogToFile = settings().value("logToFile", true).toBool();
|
||||
m_LogToFile = settings().value("logToFile", false).toBool();
|
||||
m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString();
|
||||
}
|
||||
|
||||
|
|
|
@ -118,7 +118,12 @@ CArchAppUtilWindows::getServiceArgs() const
|
|||
i++;
|
||||
}
|
||||
else {
|
||||
argBuf << " " << __argv[i];
|
||||
if (strchr(arg, ' ') != NULL) {
|
||||
// surround argument with quotes if it contains a space
|
||||
argBuf << " \"" << arg << "\"";
|
||||
} else {
|
||||
argBuf << " " << arg;
|
||||
}
|
||||
}
|
||||
}
|
||||
return argBuf.str();
|
||||
|
|
Loading…
Reference in New Issue