From: Attila Molnar <attilamolnar@hush.com>
Date: Sat, 7 Jun 2014 11:04:09 +0000 (+0200)
Subject: m_channames Call ValidateChans() from cull() on unload
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;ds=inline;h=9a8970fd0f33af44515863b28625cc4fae4c73a7;p=user%2Fhenk%2Fcode%2Finspircd.git

m_channames Call ValidateChans() from cull() on unload

This ensures that if ValidateChans() removes everyone from a channel the
channel is added to the cull list at the right time, that is, before the
destruction of objects begin.

The core IsChannel() is less strict than us regardless of our
configuration (for now) but nevertheless this is the correct behavior.
---

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 69b501792..be9eda2b9 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -141,10 +141,11 @@ class ModuleChannelNames : public Module
 		}
 	}
 
-	~ModuleChannelNames()
+	CullResult cull() CXX11_OVERRIDE
 	{
 		ServerInstance->IsChannel = rememberer;
 		ValidateChans();
+		return Module::cull();
 	}
 
 	Version GetVersion() CXX11_OVERRIDE