From d713a6c940a25c26a77214c98ecde6f8f2fd0328 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Thu, 29 Jan 2015 14:40:49 +0100
Subject: [PATCH] Fix incorrect return value for ConfigItem::ActivateItems

refs #8309
---
 lib/config/configitem.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index fbb59eb15..4f4102a5b 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -381,7 +381,11 @@ bool ConfigItem::ActivateItems(void)
 	}
 
 	upq.Join();
-	upq.ReportExceptions("ConfigItem");
+
+	if (upq.HasExceptions()) {
+		upq.ReportExceptions("ConfigItem");
+		return false;
+	}
 
 #ifdef I2_DEBUG
 	BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {