fly/flightgear
1
0
Fork 0
Code Activity

Bernie Bright:

Browse source 
fgLoad3DModel() throws an exception if it fails to load the requested model.
This causes FGTileMgr::update(...) to exit.  So I've added a try/catch block
to catch the exception and display an error message instead.
This commit is contained in:
curt 2002-09-23 14:23:17 +00:00
parent 578073a6f3
commit 7b01068d9c
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Scenery/tilemgr.cxx
View file

@ -39,6 +39,7 @@
#include <simgear/math/polar3d.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/vector.hxx>
#include <simgear/misc/exception.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
@ -330,12 +331,20 @@ int FGTileMgr::update( double lon, double lat, double visibility_meters,
#endif
ssgTexturePath( (char *)(dm->get_texture_path().c_str()) );
ssgEntity *obj_model = globals->get_model_loader()->load_model(dm->get_model_path());
if ( obj_model != NULL ) {
dm->get_obj_trans()->addKid( obj_model );
}
dm->get_tile()->dec_pending_models();
try
{
ssgEntity *obj_model =
globals->get_model_loader()->load_model(dm->get_model_path());
if ( obj_model != NULL ) {
dm->get_obj_trans()->addKid( obj_model );
}
}
catch (const sg_exception& exc)
{
SG_LOG( SG_ALL, SG_ALERT, exc.getMessage() );
}
dm->get_tile()->dec_pending_models();
delete dm;
}