From 64cd23ff1be1868be5479ad33a99d4c9b394f815 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Mon, 28 Sep 2009 20:42:32 +0200
Subject: ConfigManager: Fixed a bug causing configure() not to be called on
 some Configurables registered during configuration

---
 src/Core/ConfigManager.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/Core/ConfigManager.cpp')

diff --git a/src/Core/ConfigManager.cpp b/src/Core/ConfigManager.cpp
index 1cb4aa0..e9cc87e 100644
--- a/src/Core/ConfigManager.cpp
+++ b/src/Core/ConfigManager.cpp
@@ -106,8 +106,13 @@ void ConfigManager::configure() {
   if(configured)
     return;
 
-  for(std::set<Configurable*, Compare>::iterator c = configurables.begin(); c != configurables.end(); ++c)
-    (*c)->configure();
+  while(!unconfiguredConfigurables.empty()) {
+    std::set<Configurable*, Compare>::iterator it = unconfiguredConfigurables.begin();
+    Configurable *c = *it;
+    unconfiguredConfigurables.erase(it);
+
+    c->configure();
+  }
 
   configured = true;
 }
-- 
cgit v1.2.3