Merge pull request #337 from greenfire27/WriteDefaultsFix

Write Defaults Fix
GarageGames · Apr 2, 2016 · c47a198 · c47a198
2 parents 66a5b6c + 273e2c7
commit c47a198
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/engine/source/sim/simObject.cc b/engine/source/sim/simObject.cc
@@ -622,11 +622,8 @@ const char *SimObject::getPrefixedDataField(StringTableEntry fieldName, const ch
     // Fetch field value.
     const char* pFieldValue = getDataField( fieldName, array );
 
-    // Sanity.
-    AssertFatal( pFieldValue != NULL, "Field value cannot be NULL." );
-
     // Return without the prefix if there's no value.
-    if ( *pFieldValue == 0 )
+    if ( pFieldValue == NULL || *pFieldValue == 0 )
         return StringTable->EmptyString;
 
     // Fetch the field prefix.