X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_safelist.cpp;h=40b8d1b0f03f36bf402044d56951054751707868;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=4adfc001170f44ecb831a007eff038b10084557c;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 4adfc0011..40b8d1b0f 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -11,10 +11,7 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd.h" 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 #include "wildcard.h"
 
 /** Holds a users m_safelist state
@@ -95,7 +92,7 @@ class ModuleSafeList : public Module
 	{
 		int minusers = 0, maxusers = 0;
 
-		if (global_listing >= LimitList)
+		if (global_listing >= LimitList && !IS_OPER(user))
 		{
 			user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick);
 			user->WriteServ("321 %s Channel :Users Name",user->nick);
@@ -142,7 +139,7 @@ class ModuleSafeList : public Module
 				return 1;
 			}
 
-			DELETE(last_list_time);
+			delete last_list_time;
 			user->Shrink("safelist_last");
 		}
 
@@ -224,7 +221,7 @@ class ModuleSafeList : public Module
 			if (ld->list_ended)
 			{
 				user->Shrink("safelist_cache");
-				DELETE(ld);
+				delete ld;
 				global_listing--;
 			}
 		}
@@ -240,14 +237,14 @@ class ModuleSafeList : public Module
 			if (ld)
 			{
 				u->Shrink("safelist_cache");
-				DELETE(ld);
+				delete ld;
 				global_listing--;
 			}
 			time_t* last_list_time;
 			u->GetExt("safelist_last", last_list_time);
 			if (last_list_time)
 			{
-				DELETE(last_list_time);
+				delete last_list_time;
 				u->Shrink("safelist_last");
 			}
 		}