Changeset 5651 in orxonox.OLD for trunk/src/util/loading/load_param.cc
- Timestamp:
- Nov 20, 2005, 5:14:27 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/util/loading/load_param.cc
r5646 r5651 111 111 this->loadString = grabParameter(root, paramName); 112 112 this->object = object; 113 if ( loadString != NULL &&root != NULL)113 if (root != NULL) 114 114 { 115 115 this->executor = executor.clone(); … … 119 119 this->executor = NULL; 120 120 } 121 121 122 } 123 124 122 125 LoadParamBase::~LoadParamBase() 123 126 { 124 127 if (likely(this->executor != NULL)) 125 128 { 126 if (this->loadString!= NULL &&likely(this->object != NULL))127 this->executor->execute(this->object, this->loadString);129 if (likely(this->object != NULL)) 130 this->executor->execute(this->object, this->loadString); 128 131 129 132 delete this->executor; … … 175 178 const TiXmlNode* node; 176 179 177 if (root == NULL )180 if (root == NULL || parameterName == NULL) 178 181 return NULL; 179 182 assert( parameterName != NULL);
Note: See TracChangeset
for help on using the changeset viewer.