[Orxonox-commit 1338] r6056 - code/trunk/src/orxonox/overlays

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-11-13 11:23:54 +0100 (Fri, 13 Nov 2009)
New Revision: 6056

Modified:
   code/trunk/src/orxonox/overlays/OrxonoxOverlay.h
Log:
OrxonoxOverlay now correctly deregisters in it's old OverlayGroup if it joins a new OverlayGroup


Modified: code/trunk/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- code/trunk/src/orxonox/overlays/OrxonoxOverlay.h	2009-11-13 10:21:40 UTC (rev 6055)
+++ code/trunk/src/orxonox/overlays/OrxonoxOverlay.h	2009-11-13 10:23:54 UTC (rev 6056)
@@ -42,6 +42,7 @@
 #include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
 #include "core/WindowEventListener.h"
+#include "OverlayGroup.h"
 
 namespace orxonox
 {
@@ -172,6 +173,8 @@
         {
             if (group != this->group_)
             {
+                if(this->group_)
+                    this->group_->removeElement(this);
                 this->group_ = group;
                 this->changedOverlayGroup();
             }