From: Jilles Tjoelker Date: Sat, 28 Jun 2008 23:37:11 +0000 (+0200) Subject: Reset check_splitmode_ev to NULL after removing it, X-Git-Url: https://jfr.im/git/solanum.git/commitdiff_plain/6a3099036708c394d29f233bb35c6ec734e9c7a4 Reset check_splitmode_ev to NULL after removing it, to exclude the possibility of it being removed twice. like ircd-ratbox r25641 (jilles) reverts 788:476d29d84191 --- diff --git a/modules/m_set.c b/modules/m_set.c index 066fdb29..88e079a1 100644 --- a/modules/m_set.c +++ b/modules/m_set.c @@ -379,6 +379,7 @@ quote_splitmode(struct Client *source_p, const char *charval, int intval) splitchecking = 0; rb_event_delete(check_splitmode_ev); + check_splitmode_ev = NULL; } /* ON */ else if(newval == 1) @@ -392,6 +393,7 @@ quote_splitmode(struct Client *source_p, const char *charval, int intval) /* we might be deactivating an automatic splitmode, so pull the event */ rb_event_delete(check_splitmode_ev); + check_splitmode_ev = NULL; } /* AUTO */ else if(newval == 2) diff --git a/src/channel.c b/src/channel.c index a8f34fb9..e3e2c060 100644 --- a/src/channel.c +++ b/src/channel.c @@ -995,6 +995,7 @@ check_splitmode(void *unused) "Network rejoined, deactivating splitmode"); rb_event_delete(check_splitmode_ev); + check_splitmode_ev = NULL; } } }