From 22b4b620972d29510263805563aa53e810a11165 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Sat, 22 Mar 2008 09:01:48 +0100
Subject: support for a conf.d subdirectory

---
 uservars.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'uservars.c')

diff --git a/uservars.c b/uservars.c
index a55e558..66abbd6 100644
--- a/uservars.c
+++ b/uservars.c
@@ -267,8 +267,14 @@ bool cUserVarLine::Parse(char *s)
       cUserVar* userVar = new cUserVar;
       if (userVar->varparser.Parse(s))
       {
-         UserVars.userVars.insert(userVar);
-         return true;
+	cUserVar* oldVar = UserVars.GetFromName(userVar->Name());
+	if (oldVar) // allow redefintion of existing vars
+	  {
+	    UserVars.userVars.erase(oldVar);
+	    delete oldVar;
+	  }
+	UserVars.userVars.insert(userVar);
+	return true;
       }
    }
    return false;
-- 
cgit v1.2.3