fix another crash on exit by finally converting the rest of unguarded

[flightgear.git] / src / ATC / approach.hxx

diff --git a/src/ATC/approach.hxx b/src/ATC/approach.hxx
index 9109e45210b6c5ecb4c1fccc4f699c0ea6ff27b2..9aec71d0174e96bc9535d99387d31ffe8ca27609 100644 (file)
--- a/src/ATC/approach.hxx
+++ b/src/ATC/approach.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
 #ifndef _FG_APPROACH_HXX
@@ -122,20 +122,20 @@ class FGApproach : public FGATC {
   string   transmission;
   bool     first;
 
-  SGPropertyNode *comm1_node;
-  SGPropertyNode *comm2_node;
-
-  SGPropertyNode *atcmenu_node;
-  SGPropertyNode *atcopt0_node;
-  SGPropertyNode *atcopt1_node;
-  SGPropertyNode *atcopt2_node;
-  SGPropertyNode *atcopt3_node;
-  SGPropertyNode *atcopt4_node;
-  SGPropertyNode *atcopt5_node;
-  SGPropertyNode *atcopt6_node;
-  SGPropertyNode *atcopt7_node;
-  SGPropertyNode *atcopt8_node;
-  SGPropertyNode *atcopt9_node;
+  SGPropertyNode_ptr comm1_node;
+  SGPropertyNode_ptr comm2_node;
+
+  SGPropertyNode_ptr atcmenu_node;
+  SGPropertyNode_ptr atcopt0_node;
+  SGPropertyNode_ptr atcopt1_node;
+  SGPropertyNode_ptr atcopt2_node;
+  SGPropertyNode_ptr atcopt3_node;
+  SGPropertyNode_ptr atcopt4_node;
+  SGPropertyNode_ptr atcopt5_node;
+  SGPropertyNode_ptr atcopt6_node;
+  SGPropertyNode_ptr atcopt7_node;
+  SGPropertyNode_ptr atcopt8_node;
+  SGPropertyNode_ptr atcopt9_node;
 
   // for failure modeling
   string trans_ident;  // transmitted ident
@@ -215,12 +215,12 @@ private:
                       const double &h3);
 
   // Pointers to current users position
-  SGPropertyNode *lon_node;
-  SGPropertyNode *lat_node;
-  SGPropertyNode *elev_node;
-  SGPropertyNode *hdg_node;
-  SGPropertyNode *speed_node;
-  SGPropertyNode *etime_node;
+  SGPropertyNode_ptr lon_node;
+  SGPropertyNode_ptr lat_node;
+  SGPropertyNode_ptr elev_node;
+  SGPropertyNode_ptr hdg_node;
+  SGPropertyNode_ptr speed_node;
+  SGPropertyNode_ptr etime_node;
   
   //Update the transmission string
   void UpdateTransmission(void);