Always unload socketengines/database/protocl etc modules last, and fixed a potential crash in m_mysql when unloading when not in GDB

1 files changed, 8 insertions, 6 deletions

diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index b5f0d51f2..f539f273d 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -419,16 +419,18 @@ void ModuleManager::ClearCallBacks(Module *m)
 
 /** Unloading all modules, NEVER call this when Anope isn't shutting down.
  * Ever.
- * @param unload_proto true to unload the protocol module
  */
-void ModuleManager::UnloadAll(bool unload_proto)
+void ModuleManager::UnloadAll()
 {
-	for (std::list<Module *>::iterator it = Modules.begin(), it_end = Modules.end(); it != it_end; )
+	for (size_t i = MT_BEGIN + 1; i != MT_END; ++i)
 	{
-		Module *m = *it++;
+		for (std::list<Module *>::iterator it = Modules.begin(), it_end = Modules.end(); it != it_end; )
+		{
+			Module *m = *it++;
 
-		if (unload_proto || m->type != PROTOCOL)
-			DeleteModule(m);
+			if (static_cast<MODType>(i) == m->type)
+				DeleteModule(m);
+		}
 	}
 }