fixed small startup crash in main.c

diff --git a/src/ClientSocket.c b/src/ClientSocket.c
index 9112b850e942a828ea1250260feacc1944cdd898..7160014d36c18b089720ddf1e05f74743f4f9724 100644 (file)
--- a/src/ClientSocket.c
+++ b/src/ClientSocket.c
@@ -296,7 +296,8 @@ void free_sockets(int close_only) {
         } else
             destroy_socket(client);
     }
         } else
             destroy_socket(client);
     }

-    if(!close_only)
+    if(!close_only) {

         free(sockets);
         free(sockets);

-    sockets = NULL;
+        sockets = NULL;
+    }

 }
 }

diff --git a/src/main.c b/src/main.c
index 57e4939b8b6d4b185bb624062b725875e30bfdfd..d26219077b1fd3442ab6035c4820ef1b78c74e8c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -168,8 +168,8 @@ static int reload_configuration() {
             return 3;
         }
         free(modulelist);
             return 3;
         }
         free(modulelist);

+        event_reload(0);

     }
     }

-    event_reload(!process_state.loaded_config);

     process_state.loaded_config = 1;
     return 0;
 }
     process_state.loaded_config = 1;
     return 0;
 }


@@ -198,9 +198,9 @@ void initialize_subsystems() {
 }
 
 void shutdown_subsystems() {
 }
 
 void shutdown_subsystems() {

-    stop_modules();

     free_sockets(1);
     usleep(10000); //wait for disconnect (10ms)
     free_sockets(1);
     usleep(10000); //wait for disconnect (10ms)

+    stop_modules();

     free_sockets(0);
     qserver_free();
     free_parser();
     free_sockets(0);
     qserver_free();
     free_parser();