From 8d81f4b90a33cfdf912962efd027e2d29ed491b7 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Sat, 5 Apr 2014 23:07:52 +0200
Subject: [PATCH] Fix another bug with relative object names.

Refs #5925
---
 lib/config/aexpression.cpp | 2 +-
 lib/config/configitem.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index 46e814902..3a8299137 100644
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -532,7 +532,7 @@ Value AExpression::OpObject(const AExpression* expr, const Dictionary::Ptr& loca
 	}
 
 	if (!checkName.IsEmpty()) {
-		ConfigItem::Ptr oldItem = ConfigItem::GetObject(type, name);
+		ConfigItem::Ptr oldItem = ConfigItem::GetObject(type, checkName);
 
 		if (oldItem) {
 			std::ostringstream msgbuf;
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index baaf0e5d7..c1263a15f 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -129,7 +129,7 @@ Dictionary::Ptr ConfigItem::GetProperties(void)
 			const DynamicObjectNameHelper *nh = dynamic_cast<const DynamicObjectNameHelper *>(Type::GetByName(m_Type));
 
 			if (nh) {
-				String name = nh->MakeObjectName(m_Name, m_Properties);
+				name = nh->MakeObjectName(m_Name, m_Properties);
 
 				if (name.IsEmpty())
 					BOOST_THROW_EXCEPTION(std::runtime_error("Could not determine name for object"));