diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2009-09-28 20:42:32 +0200 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2009-09-28 20:42:32 +0200 |
commit | 64cd23ff1be1868be5479ad33a99d4c9b394f815 (patch) | |
tree | 0a889da97109b1a3e5b95b49c032d902f2db916f /src/Core/ConfigManager.cpp | |
parent | 86e5f80837ad55932f2469d79d9e6b6bb07cf5ed (diff) | |
download | mad-64cd23ff1be1868be5479ad33a99d4c9b394f815.tar mad-64cd23ff1be1868be5479ad33a99d4c9b394f815.zip |
ConfigManager: Fixed a bug causing configure() not to be called on some Configurables registered during configuration
Diffstat (limited to 'src/Core/ConfigManager.cpp')
-rw-r--r-- | src/Core/ConfigManager.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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; } |