fly/flightgear
1
0
Fork 0
Code Activity

Reset: ensure FGODGuage shutsdown cleanly.

Browse source 
- remove ODGuage instances during shutdown phase (don't wait until
deletion)
This commit is contained in:
James Turner 2013-12-06 18:45:45 +00:00
parent bb0aee4c02
commit 5a1a1781e2
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Cockpit/wxradar.cxx
View file

@ -118,7 +118,6 @@ wxRadarBg::wxRadarBg(SGPropertyNode *node) :
wxRadarBg::~wxRadarBg () wxRadarBg::~wxRadarBg ()
{ {
_font_node->removeChangeListener(this); _font_node->removeChangeListener(this);
delete _odg;
} }
@ -249,6 +248,11 @@ wxRadarBg::init ()
_time = 0.0; _time = 0.0;
} }
void wxRadarBg::shutdown()
{
delete _odg;
_odg = NULL;
}
// Local coordinates for each echo // Local coordinates for each echo
const osg::Vec3f echoCoords[4] = { const osg::Vec3f echoCoords[4] = {

2
src/Cockpit/wxradar.hxx
View file

@ -44,6 +44,8 @@ public:
virtual ~wxRadarBg(); virtual ~wxRadarBg();
virtual void init(); virtual void init();
virtual void shutdown();
virtual void update(double dt); virtual void update(double dt);
virtual void valueChanged(SGPropertyNode *); virtual void valueChanged(SGPropertyNode *);