From 64d6d0d5afd3a9600ab3e7f4896bbcbc5d9a37db Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Thu, 7 Feb 2008 22:23:51 +0000
Subject: [PATCH] Error if a channel is defined more than once

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@944 726aef4b-f618-498e-8847-2d620e286838
---
 znc.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/znc.cpp b/znc.cpp
index dac10d14..45dd5cd8 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -845,7 +845,14 @@ bool CZNC::ParseConfig(const CString& sConfig) {
 				if (pUser) {
 					if (pChan) {
 						if (sTag.CaseCmp("Chan") == 0) {
-							pUser->AddChan(pChan);
+							// Save the channel name, because AddChan
+							// deletes the CChannel*, if adding fails
+							sTag = pChan->GetName(); /* FIXME */
+							if (!pUser->AddChan(pChan)) {
+								CUtils::PrintError("Channel [" + sTag + "] defined more than once");
+								return false;
+							}
+							sTag.clear();
 							pChan = NULL;
 							continue;
 						}