Changeset 2064 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 29, 2008, 11:27:45 PM (16 years ago)

Author:

rgrieder

Message:

Fixed bug in CameraHandler: when calling requestFocus twice, the camera was added twice. So deleting it once left a potentially deleted pointer in the list —> segfault.

File:

• code/branches/objecthierarchy/src/orxonox/CameraHandler.cc (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/CameraHandler.cc

@@ -69 +69 @@
             this->cameraList_.front()->removeFocus();
 
+        camera->setFocus(this->viewport_);
+
         // add to list
+        std::list<Camera*>::iterator it;
+        for (it = this->cameraList_.begin(); it != this->cameraList_.end(); ++it)
+        {
+            if ((*it) == camera)
+                return; // make sure we don't add it twice
+        }
         this->cameraList_.push_front(camera);
-        camera->setFocus(this->viewport_);
     }