From: frohlich Date: Wed, 31 Jan 2007 20:43:10 +0000 (+0000) Subject: Modified Files: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a8a85fa80cb789a90fd980c483d215f194653eb4;p=flightgear.git Modified Files: src/Main/util.cxx: Olaf Flebbe: flush the osgDB cache just before exit. This avoids a static destructor cleanup problem with static osg linkage. --- diff --git a/src/Main/util.cxx b/src/Main/util.cxx index 3daeb991b..3eb68faa0 100644 --- a/src/Main/util.cxx +++ b/src/Main/util.cxx @@ -32,6 +32,9 @@ SG_USING_STD(vector); #include "globals.hxx" #include "util.hxx" +#ifdef OSG_LIBRARY_STATIC +#include "osgDB/Registry" +#endif void fgDefaultWeatherValue (const char * propname, double value) @@ -109,6 +112,9 @@ fgExit (int status) SGSubsystem *sub = globals->get_subsystem("ai_model"); globals->get_subsystem_mgr()->get_group(SGSubsystemMgr::GENERAL)->remove_subsystem("ai_model"); delete sub; +#ifdef OSG_LIBRARY_STATIC + osgDB::Registry::instance( true); +#endif SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status); exit(status);