3pp-mirror/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2025-06-19 11:11:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issue 506 - plus some quite major refactoring

Browse source
This commit is contained in:
Nick Bolton 2010-06-05 14:20:19 +00:00
parent a19e800b99
commit 24765e6891
8 changed files with 50 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/synergy/CServerApp.cpp
View file

@ -717,8 +717,6 @@ int CServerApp::mainLoop()
// create the event queue
CEventQueue eventQueue;
setupFileLogging();
// if configuration has no screens then add this system
// as the default
if (args().m_config->begin() == args().m_config->end()) {
@ -841,11 +839,7 @@ int daemonMainLoopStatic(int argc, const char** argv) {
int
CServerApp::standardStartup(int argc, char** argv)
{
// parse command line
parseArgs(argc, argv);
// load configuration
loadConfig();
initialize(argc, argv);
// daemonize if requested
if (args().m_daemon) {
@ -859,11 +853,7 @@ CServerApp::standardStartup(int argc, char** argv)
int
CServerApp::foregroundStartup(int argc, char** argv)
{
// parse command line
parseArgs(argc, argv);
// load configuration
loadConfig();
initialize(argc, argv);
// never daemonize
return mainLoop();