Author: cazfi
Date: Mon Jan 19 05:35:23 2015
New Revision: 27725

URL: http://svn.gna.org/viewcvs/freeciv?rev=27725&view=rev
Log:
Free lua scripting state on server exit.

See bug #23174

Modified:
    branches/S2_6/server/ruleset.c
    branches/S2_6/server/ruleset.h
    branches/S2_6/server/srv_main.c

Modified: branches/S2_6/server/ruleset.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=27725&r1=27724&r2=27725&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.c      (original)
+++ branches/S2_6/server/ruleset.c      Mon Jan 19 05:35:23 2015
@@ -6586,6 +6586,15 @@
 }
 
 /**************************************************************************
+  Completely deinitialize ruleset system. Server is not in usable
+  state after this.
+**************************************************************************/
+void rulesets_deinit(void)
+{
+  script_server_free();
+}
+
+/**************************************************************************
   Loads the rulesets from directory.
   This may be called more than once and it will free any stale data.
 **************************************************************************/

Modified: branches/S2_6/server/ruleset.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.h?rev=27725&r1=27724&r2=27725&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.h      (original)
+++ branches/S2_6/server/ruleset.h      Mon Jan 19 05:35:23 2015
@@ -34,6 +34,8 @@
 bool load_rulesets(const char *restore, bool act, bool buffer_script);
 bool reload_rulesets_settings(void);
 void send_rulesets(struct conn_list *dest);
+
+void rulesets_deinit(void);
 
 void ruleset_error_real(const char *file, const char *function,
                         int line, enum log_level level,

Modified: branches/S2_6/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=27725&r1=27724&r2=27725&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c     (original)
+++ branches/S2_6/server/srv_main.c     Mon Jan 19 05:35:23 2015
@@ -1533,6 +1533,7 @@
   edithand_free();
   voting_free();
   close_connections_and_socket();
+  rulesets_deinit();
   registry_module_close();
   fc_destroy_mutex(&game.server.mutexes.city_list);
   free_nls();


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to