delete operator tracking in debug mode (using a macro -- live with it.)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3904 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 24 insertions, 24 deletions

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 18fd995ad..3910bc030 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -46,7 +46,7 @@ public:
 				
 				if (dl)
 				{
-					delete dl;
+					DELETE(dl);
 					c->Shrink("norejoinusers");
 				}
 			}
@@ -95,38 +95,38 @@ public:
 				if (!dl->size())
 				{
 					// Now it's empty..
-					delete dl;
-					chan->Shrink("norejoinusers");
+						DELETE(dl);
+						chan->Shrink("norejoinusers");
+					}
 				}
 			}
+			return 0;
 		}
-		return 0;
-	}
-	
-	virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
-	{
-		if (chan->IsModeSet('J') && (source != user))
+		
+		virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
 		{
-			delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
-			
-			if (!dl)
+			if (chan->IsModeSet('J') && (source != user))
 			{
-				dl = new delaylist;
-				chan->Extend("norejoinusers", (char*)dl);
+				delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
+				
+				if (!dl)
+				{
+					dl = new delaylist;
+					chan->Extend("norejoinusers", (char*)dl);
+				}
+				
+				log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
+				(*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
 			}
-			
-			log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
-			(*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
 		}
-	}
-	
-	virtual void OnChannelDelete(chanrec* chan)
-	{
-		delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
 		
-		if (dl)
+		virtual void OnChannelDelete(chanrec* chan)
 		{
-			delete dl;
+			delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
+			
+			if (dl)
+			{
+				DELETE(dl);
 			chan->Shrink("norejoinusers");
 		}
 	}