since the submodel_mgr subsystem does now also hold references to AI models,

we need to explicitly destroy that here, too, so that it has guaranteed
access to the Nasal subsystem. Otherwise we get a segfault on exit. When
the next subsystem needs this special treatement (radar?), we should
introduce a new subsystem group (in addition to INIT and GENERAL)

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index 3eb68faa06f2883cdc22c61d6b6226c6b7fe7e0d..056b9c4ed7c4545f4d9f8d3ccc34001a76a89280 100644 (file)
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -109,9 +109,16 @@ fgExit (int status)
 {
     // remove subsystems first, which need access to other subsystems in their
     // destructors (e.g. "nasal")
-    SGSubsystem *sub = globals->get_subsystem("ai_model");
+    SGSubsystem *sub;
+
+    sub = globals->get_subsystem("ai_model");
     globals->get_subsystem_mgr()->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("ai_model");
     delete sub;
+
+    sub = globals->get_subsystem("submodel_mgr");
+    globals->get_subsystem_mgr()->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("submodel_mgr");
+    delete sub;
+
 #ifdef OSG_LIBRARY_STATIC
     osgDB::Registry::instance( true);
 #endif