From: curt <curt>
Date: Fri, 1 Jun 2001 18:04:10 +0000 (+0000)
Subject: Test for null object after load before trying to connect it into the scene
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=35533b3a8dcbaf894059421ce665f9dcefea9a96;p=flightgear.git

Test for null object after load before trying to connect it into the scene
graph (which would cause a crash.)
---

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index fbf44325c..ec5bd8d3e 100644
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -370,8 +370,10 @@ int FGTileMgr::update( double lon, double lat ) {
 	ssgTexturePath( (char *)(dm->get_texture_path().c_str()) );
 	ssgEntity *obj_model
 	    = ssgLoad( (char *)(dm->get_model_path().c_str()) );
-	dm->get_obj_trans()->addKid( obj_model );
-	dm->get_tile()->dec_pending_models();
+        if ( obj_model != NULL ) {
+            dm->get_obj_trans()->addKid( obj_model );
+        }
+        dm->get_tile()->dec_pending_models();
 
 	delete dm;
     }