Don't initialise MemLeakFinder twice when running as a service.

Return a non-zero exit code if running as a service fails.

(merges [1813])

1 files changed, 4 insertions, 1 deletions

diff --git a/bin/bbackupd/Win32ServiceFunctions.cpp b/bin/bbackupd/Win32ServiceFunctions.cpp
index f4c8894b..5acf5f67 100644
--- a/bin/bbackupd/Win32ServiceFunctions.cpp
+++ b/bin/bbackupd/Win32ServiceFunctions.cpp
@@ -161,7 +161,7 @@ VOID ServiceMain(DWORD argc, LPTSTR *argv)
 	}
 }
 
-void OurService(char* pConfigFileName)
+int OurService(char* pConfigFileName)
 {
 	spConfigFileName = pConfigFileName;
 
@@ -180,7 +180,10 @@ void OurService(char* pConfigFileName)
 		ErrorHandler("Failed to start service. Did you start "
 			"Box Backup from the Service Control Manager? "
 			"(StartServiceCtrlDispatcher)", GetLastError());
+		return 1;
 	}
+
+	return 0;
 }
 
 int InstallService(const char* pConfigFileName)