X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fevent.h;h=806b55309cfd6bbd82392a5fab5d4e5e391f65fa;hb=cca482b0061d43818e176c427616b0f6a4a86387;hp=92bb4ffec604f0d1f36024d3e3e50fa6a5dae970;hpb=74136695f88ded34f1413b546ad1b0699404bfe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/event.h b/include/event.h
index 92bb4ffec..806b55309 100644
--- a/include/event.h
+++ b/include/event.h
@@ -57,7 +57,23 @@ class Events::ModuleEventProvider : public ServiceProvider, private dynamic_refe
 	 */
 	const SubscriberList& GetSubscribers() const { return prov->subscribers; }
 
-	friend class ModuleEventListener;
+	/** Subscribes a listener to this event.
+	 * @param subscriber The listener to subscribe.
+	 */
+	void Subscribe(ModuleEventListener* subscriber)
+	{
+		subscribers.insert(subscriber);
+		OnSubscribe(subscriber);
+	}
+
+	/** Unsubscribes a listener from this event.
+	 * @param subscriber The listener to unsubscribe.
+	 */
+	void Unsubscribe(ModuleEventListener* subscriber)
+	{
+		subscribers.erase(subscriber);
+		OnUnsubscribe(subscriber);
+	}
 
  private:
 	void OnCapture() CXX11_OVERRIDE
@@ -67,6 +83,16 @@ class Events::ModuleEventProvider : public ServiceProvider, private dynamic_refe
 			subscribers.clear();
 	}
 
+	/** Called when a listener subscribes to this event.
+	 * @param subscriber The listener which subscribed.
+	 */
+	virtual void OnSubscribe(ModuleEventListener* subscriber) { }
+
+	/** Called when a listener unsubscribes from this event.
+	 * @param subscriber The listener which unsubscribed.
+	 */
+	virtual void OnUnsubscribe(ModuleEventListener* subscriber) { }
+
 	/** Reference to the active provider for this event. In case multiple event providers
 	 * exist for the same event, only one of them contains the list of subscribers.
 	 * To handle the case when we are not the ones with the list, we get it from the provider
@@ -95,7 +121,7 @@ class Events::ModuleEventListener : private dynamic_reference_base::CaptureHook
 	 */
 	void OnCapture() CXX11_OVERRIDE
 	{
-		prov->subscribers.insert(this);
+		prov->Subscribe(this);
 	}
 
  public:
@@ -119,9 +145,12 @@ class Events::ModuleEventListener : private dynamic_reference_base::CaptureHook
 	~ModuleEventListener()
 	{
 		if (prov)
-			prov->subscribers.erase(this);
+			prov->Unsubscribe(this);
 	}
 
+	/** Retrieves the module which created this listener. */
+	const Module* GetModule() const { return prov.creator; }
+
 	friend struct ModuleEventProvider::Comp;
 };
 
@@ -140,7 +169,9 @@ inline bool Events::ModuleEventProvider::Comp::operator()(Events::ModuleEventLis
 	for (::Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \
 	{ \
 		listenerclass* _t = static_cast<listenerclass*>(*_i); \
-		_t->func params ; \
+		const Module* _m = _t->GetModule(); \
+		if (_m && !_m->dying) \
+			_t->func params ; \
 	} \
 } while (0);
 
@@ -157,6 +188,9 @@ inline bool Events::ModuleEventProvider::Comp::operator()(Events::ModuleEventLis
 	for (::Events::ModuleEventProvider::SubscriberList::const_iterator _i = _handlers.begin(); _i != _handlers.end(); ++_i) \
 	{ \
 		listenerclass* _t = static_cast<listenerclass*>(*_i); \
+		const Module* _m = _t->GetModule(); \
+		if (!_m || _m->dying) \
+			continue; \
 		result = _t->func params ; \
 		if (result != MOD_RES_PASSTHRU) \
 			break; \