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 066fdb29d50ec8ae75dee74610c806ef8f326fac..88e079a18a3b5ee0105c8b0d1ccd320ee403420c 100644 (file)
--- 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 a8f34fb93a5ad5369eb99850f1e904f1951d248c..e3e2c060b4f3f827ad0732c784453cf48bb3591a 100644 (file)
--- 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;
                }
        }
 }