From 46a11d0d93dd1c2d91b97694094a51170d06c791 Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Sun, 6 Mar 2005 20:54:30 +0000
Subject: [PATCH] (main) [_WIN32]: Move install_service() so the config_file
 can be verified before installing.

---
 src/server/main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/server/main.c b/src/server/main.c
index d541dbf4..2587c0af 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -188,8 +188,6 @@ main(int argc, char **argv)
 
 
 #if defined(_WIN32)
-    if (install_service_set)
-        return install_service(argv[0], service_name, datadir_set, config_file);
     if (remove_service_set)
         return remove_service(service_name);
 #endif	/* _WIN32 */
@@ -200,6 +198,11 @@ main(int argc, char **argv)
     }
     emp_config(config_file);
 
+#if defined(_WIN32)
+    if (install_service_set)
+	return install_service(argv[0], service_name, datadir_set, config_file);
+#endif	/* _WIN32 */
+
 #if defined(_WIN32)
     if (daemon != 0) {
 	SERVICE_TABLE_ENTRY DispatchTable[]={{"Empire Server", service_main},{NULL, NULL}};