fly/flightgear
1
0
Fork 0
Code Activity

Closedown crash prevention

Browse source
This commit is contained in:
Richard Harrison 2015-04-10 23:46:13 +02:00
parent 475166643c
commit 9ba892962c
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Cockpit/od_gauge.cxx
View file

@ -127,8 +127,10 @@ class ReplaceStaticTextureVisitor:
simgear::EffectGeode* eg = dynamic_cast<simgear::EffectGeode*>(&node); simgear::EffectGeode* eg = dynamic_cast<simgear::EffectGeode*>(&node);
if( !eg ) if( !eg )
return; return;
simgear::Effect* eff = eg->getEffect();
osg::StateSet* ss = eg->getEffect()->getDefaultStateSet(); if (!eff)
return;
osg::StateSet* ss = eff->getDefaultStateSet();
if( !ss ) if( !ss )
return; return;

4
src/Scripting/NasalSys.cxx
View file

@ -1165,7 +1165,9 @@ bool FGNasalSys::createModule(const char* moduleName, const char* fileName,
naRef locals; naRef locals;
naRef modname = naNewString(ctx); naRef modname = naNewString(ctx);
naStr_fromdata(modname, (char*)moduleName, strlen(moduleName)); naStr_fromdata(modname, (char*)moduleName, strlen(moduleName));
if(!naHash_get(_globals, modname, &locals)) if (!((_globals).ref).ptr.obj)
return false;
if (!naHash_get(_globals, modname, &locals))
locals = naNewHash(ctx); locals = naNewHash(ctx);
_cmdArg = (SGPropertyNode*)cmdarg; _cmdArg = (SGPropertyNode*)cmdarg;