Fix an issue where max_tiles_to_unload_per_frame was causing a crash

gwaldron · Feb 23, 2024 · b880455 · b880455
1 parent 2dbba5a
commit b880455
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/osgEarthDrivers/engine_rex/TileNodeRegistry b/src/osgEarthDrivers/engine_rex/TileNodeRegistry
@@ -37,7 +37,7 @@ namespace osgEarth { namespace REX
     public:
         using Ptr = std::shared_ptr<TileNodeRegistry>;
 
-        using Tracker = SentryTracker<TileNode*>;
+        using Tracker = SentryTracker<osg::ref_ptr<TileNode>>;
 
         struct TableEntry
         {

diff --git a/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp b/src/osgEarthDrivers/engine_rex/TileNodeRegistry.cpp
@@ -247,9 +247,9 @@ TileNodeRegistry::collectDormantTiles(
 
     unsigned count = 0u;
 
-    const auto disposeTile = [&](TileNode* tile) -> bool
+    const auto disposeTile = [&](osg::ref_ptr<TileNode>& tile) -> bool
     {
-        OE_SOFT_ASSERT_AND_RETURN(tile != nullptr, true);
+        OE_SOFT_ASSERT_AND_RETURN(tile, true);
 
         const TileKey& key = tile->getKey();