Author: Carlo Wood <run@alinoe.com> (Via Isomer <isomer@undernet.org>)

[ircu2.10.12-pk.git] / ircd / m_endburst.c

diff --git a/ircd/m_endburst.c b/ircd/m_endburst.c
index d2236b054a50f3fd1b0388cee007e4cb93cf586a..68ac9e11490161c7f0eb0b235b9579e03c8d2e74 100644 (file)
--- a/ircd/m_endburst.c
+++ b/ircd/m_endburst.c
@@ -81,14 +81,6 @@
  */
 #include "config.h"
 
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
@@ -135,11 +127,8 @@ int ms_end_of_burst(struct Client* cptr, struct Client* sptr, int parc, char* pa
     next_chan = chan->next;
 
     if (!chan->members) { /* empty channel */
-      if (!(chan->mode.mode & MODE_BURSTADDED))
-       sendto_opmask_butone(0, SNO_OLDSNO, "Empty channel %H not added by "
-                            "BURST!", chan);
-
-      sub1_from_channel(chan); /* ok, nuke channel now */
+      if ((chan->mode.mode & MODE_BURSTADDED))
+       sub1_from_channel(chan); /* New empty channel, schedule it for removal. */
     }
 
     chan->mode.mode &= ~MODE_BURSTADDED;