BUILD : 1.7.11 (902) BUGS : NOTES : Changed how /os modload and /os modunload load/unload modules; they are now handled in a queue instead of using the mod_current_* variables

git-svn-id: svn://svn.anope.org/anope/trunk@902 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@648 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 4 insertions, 16 deletions

diff --git a/src/process.c b/src/process.c
index 5f5f27a50..8bf1ebb9d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -18,7 +18,6 @@
 extern Module *mod_current_module;
 extern char *mod_current_module_name;
 extern User *mod_current_user;
-extern int mod_current_op;
 extern char *mod_current_buffer;
 /*************************************************************************/
 /*************************************************************************/
@@ -285,21 +284,10 @@ void process()
         if (debug)
             alog("debug: unknown message from server (%s)", inbuf);
     }
-    if (mod_current_op == 1) {
-        alog("trying to load [%s]", mod_current_module->name);
-        alog("status: [%d]",
-             loadModule(mod_current_module, mod_current_user));
-        mod_current_module = NULL;
-        mod_current_user = NULL;
-        mod_current_op = 0;
-    } else if (mod_current_op == 2) {
-        alog("trying to unload [%s]", mod_current_module->name);
-        alog("status: [%d]",
-             unloadModule(mod_current_module, mod_current_user));
-        mod_current_module = NULL;
-        mod_current_user = NULL;
-        mod_current_op = 0;
-    }
+
+    /* Load/unload modules if needed */
+    handleModuleOperationQueue();
+
     /* Free argument list we created */
     free(av);
 }