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

Fixed issue 497

This commit is contained in:
Nick Bolton 2010-06-04 17:58:45 +00:00
parent 749a4140f3
commit f3e4c6dede
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/synergy/CApp.cpp
View File

@ -173,7 +173,20 @@ CApp::parseArgs(int argc, const char* const* argv, int& i)
// parse options
for (i = 1; i < argc; ++i) {
if (parseArg(argc, argv, i)) {
#if SYSAPI_WIN32
// suggest that user installs as a windows service. when launched as
// service, process should automatically detect that it should run in
// daemon mode.
if (argsBase().m_daemon) {
LOG((CLOG_ERR
"The --daemon argument is not supported on Windows. "
"Instead, install %s as a service (--service install).",
argsBase().m_pname));
m_bye(kExitArgs);
}
#endif
else if (parseArg(argc, argv, i)) {
continue;
}

9
lib/synergy/CServerApp.cpp
View File

@ -128,15 +128,6 @@ CServerApp::parseArgs(int argc, const char* const* argv)
m_bye(kExitArgs);
}
#if SYSAPI_WIN32
// if user wants to run as daemon, but process not launched from service launcher...
if (args().m_daemon && !CArchMiscWindows::wasLaunchedAsService()) {
LOG((CLOG_ERR "cannot launch as daemon if process not started through "
"service host (use '--service start' argument instead)"));
m_bye(kExitArgs);
}
#endif
// set log filter
if (!CLOG->setFilter(args().m_logFilter)) {
LOG((CLOG_PRINT "%s: unrecognized log level `%s'" BYE,