diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2015-08-12 15:21:46 +0200 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2015-08-12 13:23:07 +0000 |
commit | bde416afcc6233225ab990390361bad67de45463 (patch) | |
tree | 54579a817dca498e8207c292c2c517de9ab84214 /epan | |
parent | 5a926946f434bc4fbd63f8e815482c95b6173a3e (diff) |
Lua: Moved deregister out of wslua_cleanup
Change-Id: Ia43aa0e5f09400ef9923288b362256094a1241b8
Reviewed-on: https://code.wireshark.org/review/9998
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/wslua/init_wslua.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c index deee360cd3..c4178428ba 100644 --- a/epan/wslua/init_wslua.c +++ b/epan/wslua/init_wslua.c @@ -984,20 +984,20 @@ void wslua_reload_plugins (register_cb cb, gpointer client_data) { if (ops->close_dialogs) ops->close_dialogs(); - wslua_cleanup(); /* deregister */ + wslua_deregister_protocols(L); + wslua_deregister_dissector_tables(L); + wslua_deregister_listeners(L); + wslua_deregister_filehandlers(L); + wslua_deregister_menus(); + wslua_clear_plugin_list(); + + wslua_cleanup(); wslua_init(cb, client_data); /* reinitialize */ } void wslua_cleanup(void) { /* cleanup lua */ if (L) { - wslua_deregister_protocols(L); - wslua_deregister_dissector_tables(L); - wslua_deregister_listeners(L); - wslua_deregister_filehandlers(L); - wslua_deregister_menus(); - wslua_clear_plugin_list(); - lua_close(L); L = NULL; } |