Reset channel information on disconnect properly.

This fixes two instances missing in cc7240, in the fix for #218. Closes #275.
eggheads · Oct 13, 2016 · 321c219 · 321c219
1 parent d953721
commit 321c219
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/doc/Changes1.8 b/doc/Changes1.8
@@ -4,6 +4,9 @@ Eggdrop Changes (since version 1.8.0)
 
 1.8.0:
 
+  - Reset channel information on disconnect properly.
+    Patch by: Cizzle
+
   - Fix a bug introduced by Tcl interp result transition.
     Patch by: thommey / Found by: simply
 

diff --git a/src/mod/server.mod/servmsg.c b/src/mod/server.mod/servmsg.c
@@ -359,7 +359,7 @@ static int got442(char *from, char *msg)
 
     putlog(LOG_MISC, chname, IRC_SERVNOTONCHAN, chname);
     if (me && me->funcs)
-      (me->funcs[CHANNEL_CLEAR]) (chan, 1);
+      (me->funcs[CHANNEL_CLEAR]) (chan, CHAN_RESETALL);
     chan->status &= ~CHAN_ACTIVE;
 
     key = chan->channel.key[0] ? chan->channel.key : chan->key_prot;
@@ -1018,7 +1018,7 @@ static void kill_server(int idx, void *x)
     struct chanset_t *chan;
 
     for (chan = chanset; chan; chan = chan->next)
-      (me->funcs[CHANNEL_CLEAR]) (chan, 1);
+      (me->funcs[CHANNEL_CLEAR]) (chan, CHAN_RESETALL);
   }
   /* A new server connection will be automatically initiated in
    * about 2 seconds. */