Merge branch 'development'

[NeonServV5.git] / src / ChanNode.c

diff --git a/src/ChanNode.c b/src/ChanNode.c
index 23543c497273c88fff9d118db7fffc0005f268aa..44a335f1cb822f2d7c414ebeef955781c93601c1 100644 (file)
--- a/src/ChanNode.c
+++ b/src/ChanNode.c
@@ -1,4 +1,4 @@
-/* ChanNode.c - NeonServ v5.4
+/* ChanNode.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -21,6 +21,8 @@
 #include "modcmd.h"
 #include "ModeNode.h"
 #include "IRCEvents.h"
+#include "tools.h"
+#include "log.h"
 
 static struct ChanNode **chanList;
 
@@ -130,7 +132,7 @@ struct ChanNode* addChannel(const char *name) {
     struct ChanNode *chan = malloc(sizeof(*chan));
     if (!chan)
     {
-        perror("malloc() failed");
+        printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         return NULL;
     }
     strcpy(chan->name, name);
@@ -138,6 +140,7 @@ struct ChanNode* addChannel(const char *name) {
     chan->bans = NULL;
     chan->spam_settings = NULL;
     chan->usercount = 0;
+    chan->botcount = 0;
     chan->topic[0] = 0;
     chan->flags = 0;
     /* mode lists */