Merge default.

[irc/quakenet/newserv.git] / helpmod2 / huser.c

diff --git a/helpmod2/huser.c b/helpmod2/huser.c
index 2402f21cdbac5b803ca4148e2ab32c688688d7c4..8ce8de6f4c95cef878b95d9162742406cfe1ad35 100644 (file)
--- a/helpmod2/huser.c
+++ b/helpmod2/huser.c
@@ -4,14 +4,13 @@
 #include <string.h>
 #include <time.h>
 
-#include "../nick/nick.h"
-
 #include "huser.h"
 #include "hchannel.h"
 #include "haccount.h"
 #include "helpmod.h"
 #include "hban.h"
 #include "hgen.h"
+#include "hed.h"
 
 huser *huser_add(nick *nck)
 {
@@ -42,6 +41,8 @@ huser *huser_add(nick *nck)
     tmp->flood_val = 0;
     tmp->spam_val = 0.0;
 
+    tmp->editor = NULL;
+
     tmp->next = husers;
     husers = tmp;
 
@@ -56,9 +57,12 @@ void huser_del(huser *husr)
 
     for (;*ptr;ptr = &(*ptr)->next)
         if (*ptr  == husr)
-        {
-            huser *tmp = (*ptr)->next;
-            free(*ptr);
+       {
+           huser *tmp = (*ptr)->next;
+
+            hed_close(husr->editor);
+
+           free(*ptr);
             *ptr = tmp;
 
             return;
@@ -75,12 +79,12 @@ void huser_del_all(void)
 
 huser *huser_get(nick *nck)
 {
-    huser *tmp = husers;
+    huser *tmp;
 
     if (nck == NULL)
         return NULL;
 
-    for (;tmp;tmp = tmp->next)
+    for (tmp = husers;tmp;tmp = tmp->next)
         if (tmp->real_user == nck)
             return tmp;
     return NULL;