Fire service deregistration events properly.

1 files changed, 4 insertions, 1 deletions

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<std::string, ServiceProvider*>::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");