#include <boost/foreach.hpp>
#include <algorithm>
+#include <osgViewer/Viewer>
+#include <osgDB/Registry>
+
#include <simgear/structure/commands.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/misc/sg_dir.hxx>
subsystem_mgr->remove("model-manager");
_tile_mgr.clear();
+ osg::ref_ptr<osgViewer::Viewer> vw(renderer->getViewer());
+ if (vw) {
+ // https://code.google.com/p/flightgear-bugs/issues/detail?id=1291
+ // explicitly stop trheading before we delete the renderer or
+ // viewMgr (which ultimately holds refs to the CameraGroup, and
+ // GraphicsContext)
+ vw->stopThreading();
+ }
+
+ // don't cancel the pager until after shutdown, since AIModels (and
+ // potentially others) can queue delete requests on the pager.
+ if (vw && vw->getDatabasePager()) {
+ vw->getDatabasePager()->cancel();
+ vw->getDatabasePager()->clear();
+ }
+
+ osgDB::Registry::instance()->clearObjectCache();
+
// renderer touches subsystems during its destruction
set_renderer(NULL);
_scenery.clear();
_chatter_queue.clear();
delete subsystem_mgr;
- subsystem_mgr = NULL; // important so ::get_subsystem returns NULL
+ subsystem_mgr = NULL; // important so ::get_subsystem returns NULL
+ vw = 0; // don't delete the viewer until now
delete time_params;
set_matlib(NULL);
}
}
+static void treeClearAliases(SGPropertyNode* nd)
+{
+ if (nd->isAlias()) {
+ nd->unalias();
+ }
+
+ for (int i=0; i<nd->nChildren(); ++i) {
+ SGPropertyNode* cp = nd->getChild(i);
+ treeClearAliases(cp);
+ }
+}
+
void
FGGlobals::resetPropertyRoot()
{
orientHeading.clear();
orientRoll.clear();
+ // clear aliases so ref-counts are accurate when dumped
+ treeClearAliases(props);
+
SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs());
treeDumpRefCounts(0, props);