fly/flightgear
1
0
Fork 0
Code Activity

Globals: delete/shutdown tweaks.

Browse source 
Avoid aircraft-model crash in accessing fx/sound
during shutdown.
This commit is contained in:
James Turner 2013-11-16 14:25:12 +00:00
parent fe357ba2a9
commit 2c4ac08895
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Main/globals.cxx
View file

@ -191,15 +191,15 @@ FGGlobals::~FGGlobals()
ai->unbind();
subsystem_mgr->remove("ai-model");
}
subsystem_mgr->remove("fx");
subsystem_mgr->remove("sound");
subsystem_mgr->remove("aircraft-model");
subsystem_mgr->remove("tile-manager");
subsystem_mgr->remove("model-manager");
subsystem_mgr->shutdown();
subsystem_mgr->unbind();
delete subsystem_mgr;
subsystem_mgr = NULL; // important so ::get_subsystem returns NULL
delete renderer;
renderer = NULL;
@ -421,6 +421,10 @@ FGGlobals::get_subsystem_mgr () const
SGSubsystem *
FGGlobals::get_subsystem (const char * name)
{
if (!subsystem_mgr) {
return NULL;
}
return subsystem_mgr->get_subsystem(name);
}