rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 1.4.1 r601:602 into trunk

This commit is contained in:
Nick Bolton 2010-06-12 18:32:25 +00:00
parent b62582444e
commit 351818a4db
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/src/AppConfig.cpp
View File

@ -83,7 +83,7 @@ void AppConfig::loadSettings()
m_Interface = settings().value("interface").toString(); m_Interface = settings().value("interface").toString();
m_LogLevel = settings().value("logLevel", 2).toInt(); m_LogLevel = settings().value("logLevel", 2).toInt();
m_AutoDetectPaths = settings().value("autoDetectPaths", true).toBool(); 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(); m_LogFilename = settings().value("logFilename", synergyLogDir() + "synergy.log").toString();
} }

7
lib/arch/CArchAppUtilWindows.cpp
View File

@ -118,7 +118,12 @@ CArchAppUtilWindows::getServiceArgs() const
i++; i++;
} }
else { 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(); return argBuf.str();