From 351818a4dbbd1c987b862fb0940a30a872bd4f1b Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Sat, 12 Jun 2010 18:32:25 +0000
Subject: [PATCH] Merge 1.4.1 r601:602 into trunk

---
 gui/src/AppConfig.cpp            | 2 +-
 lib/arch/CArchAppUtilWindows.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gui/src/AppConfig.cpp b/gui/src/AppConfig.cpp
index 2ef35e0b..543bc633 100644
--- a/gui/src/AppConfig.cpp
+++ b/gui/src/AppConfig.cpp
@@ -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();
 }
 
diff --git a/lib/arch/CArchAppUtilWindows.cpp b/lib/arch/CArchAppUtilWindows.cpp
index 0a957e56..1480c505 100644
--- a/lib/arch/CArchAppUtilWindows.cpp
+++ b/lib/arch/CArchAppUtilWindows.cpp
@@ -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();