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

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

diff --git a/ircd/m_join.c b/ircd/m_join.c
index f07d1f1fe493f3bb627daab0b764321d55998fa2..e8f9bebe7172bdc1aecaa038752e28b0a2969f9e 100644 (file)
--- a/ircd/m_join.c
+++ b/ircd/m_join.c
@@ -79,14 +79,8 @@
  *            note:   it is guaranteed that parv[0]..parv[parc-1] are all
  *                    non-NULL pointers.
  */
-#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 "config.h"
+
 #include "channel.h"
 #include "client.h"
 #include "gline.h"
@@ -254,14 +248,15 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
          send_reply(sptr, i, chptr->chname);
          continue;
        }
-      } /* else if ((i = can_join(sptr, chptr, keys))) { */
+      } /* else if ((i = can_join(sptr, chptr, keys))) */
 
       joinbuf_join(&join, chptr, flags);
     } else if (!(chptr = get_channel(sptr, name, CGT_CREATE)))
       continue; /* couldn't get channel */
     else if (check_target_limit(sptr, chptr, chptr->chname, 1)) {
       /* Note: check_target_limit will only ever return 0 here */
-      sub1_from_channel(chptr); /* created it... */
+      chptr->members = 0;
+      destruct_channel(chptr); /* created it... */
       continue;
     } else
       joinbuf_join(&create, chptr, flags);