(main) [_WIN32]: Move install_service() so the config_file

can be verified before installing.

diff --git a/src/server/main.c b/src/server/main.c
index d541dbf43493bb11b89099416f9dfa2e9b468f1e..2587c0af900461103ee64e1bc4e5fa47671166ab 100644 (file)
--- 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}};