Changeset 6695 in orxonox.OLD for trunk/src/world_entities/movie_entity.cc

Timestamp:

Jan 25, 2006, 2:39:53 PM (18 years ago)

Author:

patrick

Message:

merged the network branche to the trunk

File:

• trunk/src/world_entities/movie_entity.cc (modified) (2 diffs)

trunk/src/world_entities/movie_entity.cc

@@ -40 +40 @@
   this->toList(OM_COMMON);
 
-  this->loadParams(root);
+  if( root != NULL)
+    this->loadParams(root);
 
   counter = 0;
@@ -52 +53 @@
 MovieEntity::~MovieEntity ()
 {
-  delete this->media_container;
+  if( this->media_container)
+    delete this->media_container;
 }