fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/Scenery/newcache.cxx: Olaf Flebbe:
	make destructor work.
	Bug: Do not modify a map while iterating over  it.
This commit is contained in:
frohlich 2007-02-14 17:55:52 +00:00
parent 96872a73cb
commit a533e0c39d
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/Scenery/newcache.cxx
View file

@ -50,6 +50,7 @@ FGNewCache::FGNewCache( void ) :
// Destructor // Destructor
FGNewCache::~FGNewCache( void ) { FGNewCache::~FGNewCache( void ) {
clear_cache();
} }
@ -229,7 +230,7 @@ void FGNewCache::clear_entry( long cache_index ) {
// Clear all completely loaded tiles (ignores partially loaded tiles) // Clear all completely loaded tiles (ignores partially loaded tiles)
void FGNewCache::clear_cache() { void FGNewCache::clear_cache() {
std::vector<long> indexList;
tile_map_iterator current = tile_cache.begin(); tile_map_iterator current = tile_cache.begin();
tile_map_iterator end = tile_cache.end(); tile_map_iterator end = tile_cache.end();
@ -239,10 +240,13 @@ void FGNewCache::clear_cache() {
FGTileEntry *e = current->second; FGTileEntry *e = current->second;
if ( e->is_loaded() && (e->get_pending_models() == 0) ) { if ( e->is_loaded() && (e->get_pending_models() == 0) ) {
e->tile_bucket.make_bad(); e->tile_bucket.make_bad();
entry_free(index); // entry_free modifies tile_cache, so store index and call entry_free() later;
indexList.push_back( index);
} }
} }
for (unsigned int it = 0; it < indexList.size(); it++) {
entry_free( indexList[ it]);
}
// and ... just in case we missed something ... // and ... just in case we missed something ...
osg::Group* group = globals->get_scenery()->get_terrain_branch(); osg::Group* group = globals->get_scenery()->get_terrain_branch();
group->removeChildren(0, group->getNumChildren()); group->removeChildren(0, group->getNumChildren());