From 9c11dfd545e466d863c7aac2b4dd18328b1e5360 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 3 Dec 2013 21:38:24 +0000
Subject: [PATCH] Reset: free nasal-module-listeners on shutdown.

---
 src/Scripting/NasalSys.cxx | 6 ++++++
 src/Scripting/NasalSys.hxx | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 57967ebf6..16a2699da 100644
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -826,6 +826,11 @@ void FGNasalSys::shutdown()
     }
     _commands.clear();
     
+    std::vector<FGNasalModuleListener*>::iterator k = _moduleListeners.begin();
+    for(; k!= _moduleListeners.end(); ++k)
+        delete *k;
+    _moduleListeners.clear();
+    
     naClearSaved();
     
     _string = naNil(); // will be freed by _context
@@ -1007,6 +1012,7 @@ void FGNasalSys::loadPropertyScripts(SGPropertyNode* n)
         if (enable)
         {
             FGNasalModuleListener* listener = new FGNasalModuleListener(n);
+            _moduleListeners.push_back(listener);
             enable->addChangeListener(listener, false);
         }
     }
diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index f8be35db1..d4680f139 100644
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -22,6 +22,7 @@ class FGNasalListener;
 class SGCondition;
 class FGNasalModelData;
 class NasalCommand;
+class FGNasalModuleListener;
 
 namespace simgear { class BufferedLogCallback; }
 
@@ -159,6 +160,8 @@ private:
     std::map<int, FGNasalListener *> _listener;
     std::vector<FGNasalListener *> _dead_listener;
     
+    std::vector<FGNasalModuleListener*> _moduleListeners;
+    
     static int _listenerId;
 
     void loadPropertyScripts();
-- 
2.39.5