fly/flightgear
1
0
Fork 0
Code Activity

- remove listener in ~FGNasalListener(), not FGNasalSys::removelistener

Browse source 
- delete all listeners in ~FGNasalSys()
This commit is contained in:
mfranz 2006-06-10 22:21:22 +00:00
parent dee302354f
commit 00f3d1db80
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Scripting/NasalSys.cxx
View file

@ -60,6 +60,10 @@ FGNasalSys::FGNasalSys()
FGNasalSys::~FGNasalSys() FGNasalSys::~FGNasalSys()
{ {
map<int, FGNasalListener *>::iterator it, end = _listener.end();
for (it = _listener.begin(); it != end; ++it)
delete it->second;
// Nasal doesn't have a "destroy context" API yet. :( // Nasal doesn't have a "destroy context" API yet. :(
// Not a problem for a global subsystem that will never be // Not a problem for a global subsystem that will never be
// destroyed. And the context is actually a global, so no memory // destroyed. And the context is actually a global, so no memory
@ -679,7 +683,6 @@ naRef FGNasalSys::removeListener(int argc, naRef* args)
return naNil(); return naNil();
FGNasalListener *nl = _listener[i]; FGNasalListener *nl = _listener[i];
nl->_node->removeChangeListener(nl);
_listener.erase(i); _listener.erase(i);
delete nl; delete nl;
return naNum(_listener.size()); return naNum(_listener.size());
@ -701,6 +704,7 @@ FGNasalListener::FGNasalListener(SGPropertyNode_ptr node, naRef handler,
FGNasalListener::~FGNasalListener() FGNasalListener::~FGNasalListener()
{ {
_node->removeChangeListener(this);
_nas->gcRelease(_gcKey); _nas->gcRelease(_gcKey);
} }