Changeset 2082 for code/branches/objecthierarchy/src/orxonox/objects

Timestamp:

Nov 1, 2008, 1:48:57 PM (16 years ago)

Author:

landauf

Message:

• simplified some event code
• prevents infinite event loops
• fixed some leaky memory behavior in XMLPort and EventIncludes

Location:

code/branches/objecthierarchy/src/orxonox/objects

Files:

• EventListener.cc (modified) (2 diffs)
• EventListener.h (modified) (1 diff)
• EventTarget.cc (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/objects/EventListener.cc

@@ -41 +41 @@
     {
         RegisterObject(EventListener);
+
+        this->bActive_ = false;
     }
 
@@ -56 +58 @@
     void EventListener::processEvent(Event& event)
     {
+        if (this->bActive_)
+        {
+            COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << "\"" << std::endl;
+            return;
+        }
+
+        this->bActive_ = true;
+
         this->fireEvent(event.activate_, event.originator_);
+
+        this->bActive_ = false;
     }
 

code/branches/objecthierarchy/src/orxonox/objects/EventListener.h

@@ -55 +55 @@
 
             std::string eventName_;
+            bool bActive_;
     };
 }

code/branches/objecthierarchy/src/orxonox/objects/EventTarget.cc

@@ -64 +64 @@
     void EventTarget::addAsEvent(BaseObject* object)
     {
-        object->addEvent(this, "");
+        if (object != (BaseObject*)this)
+            object->addEvent(this, "");
     }
 }