Fix core message events not being fired.

Third time lucky eh?

diff --git a/include/event.h b/include/event.h
index b4b695d0e5e8758f2acd6c5d4a058e90b02c138a..d3b7792164237cc0995ead826da08529584936b0 100644 (file)
--- a/include/event.h
+++ b/include/event.h
@@ -184,7 +184,7 @@ inline bool Events::ModuleEventProvider::ElementComp::operator()(Events::ModuleE
  * FOREACH_MOD_CUSTOM(accountevprov, AccountEventListener, OnAccountChange, MOD_RESULT, (user, newaccount))
  */
 #define FOREACH_MOD_CUSTOM(prov, listenerclass, func, params) do { \
-       if ((prov).GetModule() && !(prov).GetModule()->dying) \
+       if (!(prov).GetModule() || !(prov).GetModule()->dying) \
        { \
                const ::Events::ModuleEventProvider::SubscriberList& _handlers = (prov).GetSubscribers(); \
                for (::Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \
@@ -206,7 +206,7 @@ inline bool Events::ModuleEventProvider::ElementComp::operator()(Events::ModuleE
  */
 #define FIRST_MOD_RESULT_CUSTOM(prov, listenerclass, func, result, params) do { \
        result = MOD_RES_PASSTHRU; \
-       if ((prov).GetModule() && !(prov).GetModule()->dying) \
+       if (!(prov).GetModule() || !(prov).GetModule()->dying) \
        { \
                const ::Events::ModuleEventProvider::SubscriberList& _handlers = (prov).GetSubscribers(); \
                for (::Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \