Merge pull request #80 from quakenet/retropc-patch-3

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

diff --git a/helpmod2/hchannel.c b/helpmod2/hchannel.c
index a2b936213a2051a4d81596f09a1843e57aebbe16..d511bcfeac4f92f0900d1c5114fe4dbf2ce449c5 100644 (file)
--- a/helpmod2/hchannel.c
+++ b/helpmod2/hchannel.c
@@ -210,8 +210,7 @@ void hchannel_remove_inactive_users(void)
                if (
                    (huser_get_level((*hchanuser)->husr) == H_PEON) &&
                    (time(NULL) - huser_on_channel((*hchanuser)->husr,hchan)->last_activity >= hchan->max_idle) &&
-                   !(on_queue((*hchanuser)->husr, huser_on_channel((*hchanuser)->husr, hchan))) &&
-                    !IsSetHost((*hchanuser)->husr->real_user)
+                   !(on_queue((*hchanuser)->husr, huser_on_channel((*hchanuser)->husr, hchan)))
                   )
                {
                    if (huser_on_channel((*hchanuser)->husr, hchan)->flags & H_IDLE_WARNING)
@@ -332,6 +331,7 @@ void hchannels_dnmo(struct huser_struct *husr)
                         break;
                 }
             *hchanuser = tmp;
+            assert(*hchanuser != NULL);
             (*hchanuser)->next = NULL;
             if (on_desk(husr, huserchan))
             {