FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canvas: Set pointers to NULL instead of calling .release()

Browse Source 
The Canvas camera and texture get recreated in several circumstances.
Calling .release() on a ref_ptr will just return the raw pointer and
'delete' won't be called. The proper way to explicitly delete an object
managed by a ref_ptr is to set the ref_ptr to NULL. This will delete it
as long as it's not referenced by any other ref_ptr.
This commit is contained in:
Fernando García Liñán 2021-08-31 18:04:50 +02:00 committed by Automatic Release Builder
parent 5fe527a2d1
commit 44bae773a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/canvas/ODGauge.cxx
View File

@ -298,8 +298,8 @@ namespace canvas
{ {
if( camera.valid() && Canvas::getSystemAdapter() ) if( camera.valid() && Canvas::getSystemAdapter() )
Canvas::getSystemAdapter()->removeCamera(camera.get()); Canvas::getSystemAdapter()->removeCamera(camera.get());
camera.release(); camera = nullptr;
texture.release(); texture = nullptr;
_flags &= ~AVAILABLE; _flags &= ~AVAILABLE;
} }