Add new cross-module event system

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 6510c9423f19bb51f500096308471aa8649d5077..55d41674bc82a726c8c2ca82a26b4ea64e81b3e7 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -655,7 +655,7 @@ ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string&
 }
 
 dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::string& Name)
-       : name(Name), value(NULL), creator(Creator)
+       : name(Name), hook(NULL), value(NULL), creator(Creator)
 {
        if (!dynrefs)
                dynrefs = new insp::intrusive_list<dynamic_reference_base>;
@@ -688,7 +688,15 @@ void dynamic_reference_base::resolve()
        // to ensure a dynref with the same name as another one resolves to the same object
        std::multimap<std::string, ServiceProvider*>::iterator i = ServerInstance->Modules.DataProviders.lower_bound(name);
        if ((i != ServerInstance->Modules.DataProviders.end()) && (i->first == this->name))
-               value = static_cast<DataProvider*>(i->second);
+       {
+               ServiceProvider* newvalue = i->second;
+               if (value != newvalue)
+               {
+                       value = newvalue;
+                       if (hook)
+                               hook->OnCapture();
+               }
+       }
        else
                value = NULL;
 }