fly/flightgear
1
0
Fork 0
Code Activity

Fix orthophotos not being cleaned up on scenery reload

Browse source
This commit is contained in:
Nathaniel Warner 2020-11-27 12:34:40 -08:00 committed by Scott Giese
parent fa09c3a6e2
commit 4ddc3dc8aa
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Scenery/tileentry.cxx
View file

@ -84,7 +84,7 @@ void TileEntry::_create_orthophoto() {
} }
void TileEntry::_free_orthophoto() { void TileEntry::_free_orthophoto() {
if (_orthophoto) { if (_orthophoto && tile_bucket.isValid()) {
simgear::OrthophotoManager::instance()->unregisterOrthophoto(tile_bucket.gen_index()); simgear::OrthophotoManager::instance()->unregisterOrthophoto(tile_bucket.gen_index());
} }
} }

2
src/Scenery/tilemgr.cxx
View file

@ -180,6 +180,8 @@ void FGTileMgr::reinit()
SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." ); SG_LOG( SG_TERRAIN, SG_INFO, "Initializing Tile Manager subsystem." );
auto terraSync = globals->get_subsystem<simgear::SGTerraSync>(); auto terraSync = globals->get_subsystem<simgear::SGTerraSync>();
simgear::OrthophotoManager::instance()->unregisterAll();
// drops the previous options reference // drops the previous options reference
_options = new simgear::SGReaderWriterOptions; _options = new simgear::SGReaderWriterOptions;
_listener.reset(new TileManagerListener(this)); _listener.reset(new TileManagerListener(this));

1
src/Scenery/tilemgr.hxx
View file

@ -27,6 +27,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/scene/util/OrthophotoManager.hxx>
#include "SceneryPager.hxx" #include "SceneryPager.hxx"
#include "tilecache.hxx" #include "tilecache.hxx"