From 414e65c75b95dd51e226ef9758e9260197c21da6 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 4 Dec 2020 15:32:02 +0000 Subject: Fire service deregistration events properly. --- src/modules.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules.cpp b/src/modules.cpp index 77e4142b3..b6a29fcfa 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -409,7 +409,10 @@ void ModuleManager::DoSafeUnload(Module* mod) { std::multimap::iterator curr = i++; if (curr->second->creator == mod) + { DataProviders.erase(curr); + FOREACH_MOD(OnServiceDel, (*curr->second)); + } } dynamic_reference_base::reset_all(); @@ -599,7 +602,7 @@ void ModuleManager::DelService(ServiceProvider& item) case SERVICE_IOHOOK: { DelReferent(&item); - return; + break; } default: throw ModuleException("Cannot delete unknown service type"); -- cgit v1.2.3