let removelistener() return the number of remaining Nasal listeners. (We

need to return nil for errors and something else for success, so we can
as well return something (remotely) useful.)

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 2415d5f9ad51ef5cdec4c0d87b6f31f1d817024e..2cbedf80f986a4055d6f128a163a4859242ae1d5 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -626,8 +626,9 @@ naRef FGNasalSys::setListener(int argc, naRef* args)
 
     FGNasalListener *nl = new FGNasalListener(node, handler, this,
             gcSave(handler));
-    _listener[_listenerId] = nl;
     node->addChangeListener(nl, initial);
+
+    _listener[_listenerId] = nl;
     return naNum(_listenerId++);
 }
 
@@ -647,6 +648,6 @@ naRef FGNasalSys::removeListener(int argc, naRef* args)
     nl->_node->removeChangeListener(nl);
     _listener.erase(i);
     delete nl;
-    return id;
+    return naNum(_listener.size());
 }