*** VERSION 5.2.0 ***

[NeonServV5.git] / src / ChanNode.c

diff --git a/src/ChanNode.c b/src/ChanNode.c
index af8a5bb892a6b4ef985825cec97e54bdeebecb47..55f1302720f0684fb2bdc6cb7fab4ac8518d3ea7 100644 (file)
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -1,4 +1,4 @@
-/* ChanNode.c - NeonServ v5.1
+/* ChanNode.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 #include "BanNode.h"
 #include "modcmd.h"
 #include "ModeNode.h"
+#include "bot_NeonSpam.h"
 
 static struct ChanNode **chanList;
 
@@ -47,9 +48,7 @@ void free_ChanNode() {
             next = chan->next;
             for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = next_chanuser) {
                 next_chanuser = getChannelUsers(chan, chanuser);
-                if(chanuser->spamnode)
-                    free(chanuser->spamnode);
-                free(chanuser);
+                freeChanUser(chanuser);
             }
             freeChanNode(chan);
         }
@@ -224,7 +223,7 @@ void freeChanNode(struct ChanNode* chan) {
     if(chan->bans)
         removeChannelBans(chan);
     if(chan->spam_settings)
-        free(chan->spam_settings);
+        freeNeonSpamSettings(chan->spam_settings);
     free(chan);
 }
 
@@ -245,9 +244,7 @@ void checkChannelVisibility(struct ChanNode* chan) {
             //free the user (no more channels)
             delUser(chanuser->user, 1);
         }
-        if(chanuser->spamnode)
-            free(chanuser->spamnode);
-        free(chanuser);
+        freeChanUser(chanuser);
     }
     chan->user = NULL;
     delChannel(chan, 1);