Keep ref_ptr in FGNasalModelData (should fix #1234)

diff --git a/src/Scripting/NasalModelData.cxx b/src/Scripting/NasalModelData.cxx
index 4d0bda95cb55ddf17087d00c85427b840613e17e..15bbf37ee723d4f2dfec1abb89b675407dab39d3 100644 (file)
--- a/src/Scripting/NasalModelData.cxx
+++ b/src/Scripting/NasalModelData.cxx
@@ -100,7 +100,7 @@ FGNasalModelData::~FGNasalModelData()
   (
     SG_NASAL,
     SG_INFO,
-    "Removed model with script(s) (branch = " << _branch << ")"
+    "Removed model with script(s) (branch = " << _branch.get() << ")"
   );
 }
 
@@ -127,7 +127,7 @@ void FGNasalModelData::load()
       .method("getPose", &f_node_getPose);
   }
 
-  module.set("_model", NodeRef(_branch));
+  module.set("_model", _branch);
 
   naRef arg[2];
   arg[0] = nasalSys->propNodeGhost(_root);
@@ -163,7 +163,7 @@ void FGNasalModelData::unload()
 //------------------------------------------------------------------------------
 osg::Node* FGNasalModelData::getNode()
 {
-  return _branch;
+  return _branch.get();
 }
 
 //------------------------------------------------------------------------------

diff --git a/src/Scripting/NasalModelData.hxx b/src/Scripting/NasalModelData.hxx
index 22ae536fe7820e957e759cb3936e58cf65b3b6e5..dbe59b76132207d276039c0d7b39cee46a033645 100644 (file)
--- a/src/Scripting/NasalModelData.hxx
+++ b/src/Scripting/NasalModelData.hxx
@@ -67,7 +67,7 @@ private:
     std::string _module, _path;
     SGPropertyNode_ptr _root, _prop;
     SGConstPropertyNode_ptr _load, _unload;
-    osg::Node *_branch;
+    osg::ref_ptr<osg::Node> _branch;
     unsigned int _module_id;
 };