From d76346d3d4c16188ae1c014c791465d6391c40a8 Mon Sep 17 00:00:00 2001
From: "B.Greenham" <taros34@hotmail.com>
Date: Thu, 29 Jul 2010 14:26:18 -0400
Subject: [PATCH] Make channel::admin_on_channel_create only work if admin is
 enabled.

---
 src/channel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/channel.c b/src/channel.c
index 3e47278..af30d4e 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1873,7 +1873,7 @@ void user_join(struct Client * client_p, struct Client * source_p, const char *
 				continue;
 			}
 
-			if(ConfigChannel.admin_on_channel_create)
+			if(ConfigChannel.admin_on_channel_create && ConfigChannel.use_admin)
 				flags = CHFL_ADMIN | CHFL_CHANOP;
 			else
 				flags = CHFL_CHANOP;