Backported Shawn's NoSnoticeStack code from insp21

2 files changed, 2 insertions, 1 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index a1a244501..eecf01d8d 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -505,6 +505,7 @@ void ServerConfig::Fill()
 	Limits.MaxGecos = ConfValue("limits")->getInt("maxgecos", 128);
 	Limits.MaxAway = ConfValue("limits")->getInt("maxaway", 200);
 	InvBypassModes = options->getBool("invitebypassmodes", true);
+	NoSnoticeStack = options->getBool("nosnoticestack", false);
 
 	range(SoftLimit, 10, ServerInstance->SE->GetMaxFds(), ServerInstance->SE->GetMaxFds(), "<performance:softlimit>");
 	range(MaxConn, 0, SOMAXCONN, SOMAXCONN, "<performance:somaxconn>");
diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index f8e1fc158..e0849147b 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -83,7 +83,7 @@ SnomaskManager::SnomaskManager()
 
 void Snomask::SendMessage(const std::string &message, char mysnomask)
 {
-	if (message != LastMessage || mysnomask != LastLetter)
+	if (ServerInstance->Config->NoSnoticeStack || message != LastMessage || mysnomask != LastLetter)
 	{
 		this->Flush();
 		LastMessage = message;