From 25ee5dd1fdd248fb031f58f1b84d888241330e86 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Sat, 8 Nov 2014 14:24:17 +0100
Subject: [PATCH] Fix problem with missing config items

---
 lib/config/configitem.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 8199e029f..c39c828ce 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -231,11 +231,20 @@ void ConfigItem::Register(void)
 {
 	String name = m_Name;
 
-	shared_ptr<NameComposer> nc = dynamic_pointer_cast<NameComposer>(Type::GetByName(m_Type));
+	/* If this is a non-abstract object we need to figure out
+	 * its real name now - or assign it a temporary name. */
+	if (!m_Abstract) {
+		shared_ptr<NameComposer> nc = dynamic_pointer_cast<NameComposer>(Type::GetByName(m_Type));
 
-	/* If this is a non-abstract object with a composite name we don't register it. */
-	if (!m_Abstract && nc)
-		return;
+		if (nc) {
+			name = nc->MakeName(m_Name, Dictionary::Ptr());
+
+			ASSERT(name.IsEmpty() || name == m_Name);
+
+			if (name.IsEmpty())
+				name = Utility::NewUniqueID();
+		}
+	}
 
 	std::pair<String, String> key = std::make_pair(m_Type, name);
 	ConfigItem::Ptr self = GetSelf();
-- 
2.49.0