X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmisccommands.cpp;h=78ff4db5a1d36dd51d07e441335f27deed76793f;hb=dcafba95960685120b1f6d902de623ca10ed6135;hp=1d4104f285b723c7c8deb1209f59ddfe231f7e75;hpb=e2fcf7b3b15f86fec250b7b784bdf3d0631048c6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/misccommands.cpp b/src/modules/m_spanningtree/misccommands.cpp
index 1d4104f28..78ff4db5a 100644
--- a/src/modules/m_spanningtree/misccommands.cpp
+++ b/src/modules/m_spanningtree/misccommands.cpp
@@ -1,13 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2007-2008, 2012 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -31,12 +26,18 @@
 
 void CmdBuilder::FireEvent(Server* target, const char* cmd, ClientProtocol::TagMap& taglist)
 {
+	if (!Utils->Creator || Utils->Creator->dying)
+		return;
+
 	FOREACH_MOD_CUSTOM(Utils->Creator->GetMessageEventProvider(), ServerProtocol::MessageEventListener, OnBuildMessage, (target, cmd, taglist));
 	UpdateTags();
 }
 
 void CmdBuilder::FireEvent(User* target, const char* cmd, ClientProtocol::TagMap& taglist)
 {
+	if (!Utils->Creator || Utils->Creator->dying)
+		return;
+
 	FOREACH_MOD_CUSTOM(Utils->Creator->GetMessageEventProvider(), ServerProtocol::MessageEventListener, OnBuildMessage, (target, cmd, taglist));
 	UpdateTags();
 }
@@ -59,10 +60,9 @@ void CmdBuilder::UpdateTags()
 			}
 		}
 		taglist.push_back(' ');
-		content.insert(0, taglist);
 	}
 	content.replace(0, tagsize, taglist);
-	tagsize = content.length();
+	tagsize = taglist.length();
 }
 
 CmdResult CommandSNONotice::Handle(User* user, Params& params)