CVS: source/src/Instrumentation navradio.cxx, 1.66, 1.67

James Turner <[email protected]> Mon, 26 Apr 2010 11:05:23 -0500
Newsgroups gmane.games.flightgear.cvc
Message-ID <[email protected]>
Update of /var/cvs/FlightGear-0.9/source/src/Instrumentation
In directory baron.flightgear.org:/tmp/cvs-serv25731/src/Instrumentation

Modified Files:
	navradio.cxx 
Log Message:
Fix a crash if startup fails before the navradio is inited.


Index: navradio.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Instrumentation/navradio.cxx,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- navradio.cxx	27 Mar 2010 17:00:26 -0000	1.66
+++ navradio.cxx	26 Apr 2010 16:04:41 -0000	1.67
@@ -129,9 +129,14 @@
 // Destructor
 FGNavRadio::~FGNavRadio() 
 {
-    gps_course_node->removeChangeListener(this);
-    nav_slaved_to_gps_node->removeChangeListener(this);
-  
+    if (gps_course_node) {
+      gps_course_node->removeChangeListener(this);
+    }
+    
+    if (nav_slaved_to_gps_node) {
+      nav_slaved_to_gps_node->removeChangeListener(this);
+    }
+    
     delete term_tbl;
     delete low_tbl;
     delete high_tbl;


------------------------------------------------------------------------------