Commit Diff

Commit:
47026e14ce661a041a0151f6c1e0c79e26d08d01
From:
Alexander Barton <alex@barton.de>
Date:
Message:
Don't assert() when a pre-defined channel has no topic.
Actions:
Patch | Tree
commit - 63626449f805051e26e35961b7eb18d3a833162b
commit + 47026e14ce661a041a0151f6c1e0c79e26d08d01
blob - 1b7164f5ac40d914e033aa184eee48c66c6ba971
blob + 922b308337bb310d8ce8f2471df5a04e81cc1597
--- src/ngircd/channel.c
+++ src/ngircd/channel.c
@@ -17,7 +17,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.55 2006/04/23 10:33:37 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.56 2006/07/24 22:54:09 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -106,7 +106,8 @@ Channel_InitPredefined( void )
 		if (chan) {
 			Channel_ModeAdd(chan, 'P');
 
-			Channel_SetTopic(chan, NULL,
+			if (array_start(&Conf_Channel[i].topic) != NULL)
+				Channel_SetTopic(chan, NULL,
 					 array_start(&Conf_Channel[i].topic));
 			array_free(&Conf_Channel[i].topic);