[Orxonox-commit 1501] r6219 - code/branches/presentation2/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-02 23:29:35 +0100 (Wed, 02 Dec 2009)
New Revision: 6219

Modified:
   code/branches/presentation2/src/libraries/core/ConfigValueContainer.h
Log:
Don't really know, but the last revision could in same cases lead to inconsistent behavior when a config value callback triggers another call to setConfigValues.
This change will avoid such problems.

Modified: code/branches/presentation2/src/libraries/core/ConfigValueContainer.h
===================================================================
--- code/branches/presentation2/src/libraries/core/ConfigValueContainer.h	2009-12-02 21:20:37 UTC (rev 6218)
+++ code/branches/presentation2/src/libraries/core/ConfigValueContainer.h	2009-12-02 22:29:35 UTC (rev 6219)
@@ -149,14 +149,12 @@
                     this->value_.getValue(value);
                     if (this->bContainerIsNew_ || (*value) != temp)
                     {
+                        this->bContainerIsNew_ = false;
                         if (this->callback_ && object)
                             this->callback_->call(object);
                         else
                             this->bDoInitialCallback_ = true;
                     }
-
-                    if (this->bContainerIsNew_)
-                        this->bContainerIsNew_ = false;
                 }
                 else
                 {