Changeset 8655 for code/branches/presentation/src/libraries

Timestamp:

May 29, 2011, 10:31:15 AM (14 years ago)

Author:

landauf

Message:

fixed crashing assertion in case a template linked to a non-existing template

File:

• code/branches/presentation/src/libraries/core/BaseObject.cc (modified) (1 diff)

code/branches/presentation/src/libraries/core/BaseObject.cc

@@ -195 +195 @@
     void BaseObject::addTemplate(Template* temp)
     {
+        // network
+        if (temp->isLink())
+        {
+            this->networkTemplateNames_.insert(temp->getLink());
+            
+            Template* link;
+            assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink());
+        }
+        else
+            this->networkTemplateNames_.insert(temp->getName());
+
+        // add template
         this->templates_.insert(temp);
-        if( temp->isLink() )
-        {
-          this->networkTemplateNames_.insert(temp->getLink());
-          assert( !Template::getTemplate(temp->getLink())->isLink() );
-        }
-        else
-          this->networkTemplateNames_.insert(temp->getName());
         temp->applyOn(this);
     }