X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=d9ceeaab197fb78daeac5d88541f067ee27e1962;hb=0a9c72335a3d3dea286382ad3e7635a05713d7cc;hp=b29b397475e5e304fb2e79b76e85e3713258a666;hpb=d23c030c9a8fd58807438245a004e4aa5b7288ba;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index b29b39747..d9ceeaab1 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -38,7 +38,10 @@
 class BanException : public ListModeBase
 {
  public:
-	BanException(Module* Creator) : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true) { }
+	BanException(Module* Creator)
+		: ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true)
+	{
+	}
 };
 
 
@@ -53,7 +56,7 @@ class ModuleBanException : public Module
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		tokens["EXCEPTS"] = "e";
+		tokens["EXCEPTS"] = ConvToStr(be.GetModeChar());
 	}
 
 	ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE
@@ -64,7 +67,7 @@ class ModuleBanException : public Module
 
 		for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
 		{
-			if (it->mask[0] != type || it->mask[1] != ':')
+			if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
 				continue;
 
 			if (chan->CheckBan(user, it->mask.substr(2)))