Check virtual mode bases better

2 files changed, 12 insertions, 1 deletions

diff --git a/include/modes.h b/include/modes.h
index 9c5916c0f..729e979d4 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -107,6 +107,8 @@ class CoreExport ChannelMode : public Mode
 
 	bool CanSet(User *u) const anope_override;
 
+	virtual void Check() { }
+
 	/** 'wrap' this channel mode and param to the underlying mode and param
 	 */
 	virtual ChannelMode *Wrap(Anope::string &param);
@@ -215,6 +217,8 @@ class CoreExport ChannelModeVirtual : public T
 
 	~ChannelModeVirtual();
 
+	void Check() anope_override;
+
 	ChannelMode *Wrap(Anope::string &param) anope_override;
 
 	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) = 0;
diff --git a/src/modes.cpp b/src/modes.cpp
index dafe2ddca..38266f95f 100644
--- a/src/modes.cpp
+++ b/src/modes.cpp
@@ -213,7 +213,7 @@ ChannelModeVirtual<T>::~ChannelModeVirtual()
 }
 
 template<typename T>
-ChannelMode *ChannelModeVirtual<T>::Wrap(Anope::string &param)
+void ChannelModeVirtual<T>::Check()
 {
 	if (basech == NULL)
 	{
@@ -221,7 +221,11 @@ ChannelMode *ChannelModeVirtual<T>::Wrap(Anope::string &param)
 		if (basech)
 			basech->listeners.push_back(this);
 	}
+}
 
+template<typename T>
+ChannelMode *ChannelModeVirtual<T>::Wrap(Anope::string &param)
+{
 	return basech;
 }
 
@@ -453,6 +457,9 @@ bool ModeManager::AddChannelMode(ChannelMode *cm)
 
 	FOREACH_MOD(OnChannelModeAdd, (cm));
 
+	for (unsigned int i = 0; i < ChannelModes.size(); ++i)
+		ChannelModes[i]->Check();
+
 	return true;
 }