diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx index 55b601ac0..fc9ea3e5d 100644 --- a/src/Main/globals.cxx +++ b/src/Main/globals.cxx @@ -231,7 +231,9 @@ FGGlobals::~FGGlobals() } osgDB::Registry::instance()->clearObjectCache(); - subsystem_mgr->remove(FGScenery::staticSubsystemClassId()); + if (subsystem_mgr->get_subsystem(FGScenery::staticSubsystemClassId())) { + subsystem_mgr->remove(FGScenery::staticSubsystemClassId()); + } // renderer touches subsystems during its destruction set_renderer(nullptr);