In the quest of fixing the FGFS-simply-exiting-with-no-sound-device
issue, i found a crash in fgExitCleanup, because the FGMultiplayMgr
isn't created yet at that point.



Pigeon.

Index: src/Network/multiplay.cxx
===================================================================
RCS file: /var/cvs/FlightGear-0.9/source/src/Network/multiplay.cxx,v
retrieving revision 1.12
diff -u -r1.12 multiplay.cxx
--- src/Network/multiplay.cxx   21 Feb 2006 01:19:47 -0000      1.12
+++ src/Network/multiplay.cxx   23 Apr 2006 07:59:41 -0000
@@ -219,13 +219,19 @@
 ******************************************************************/
 bool FGMultiplay::close() {
 
+  FGMultiplayMgr *mgr = globals->get_multiplayer_mgr();
+
+  if (mgr == 0) {
+    return false;
+  }
+
   if (get_direction() == SG_IO_IN) {
 
-    globals->get_multiplayer_mgr()->Close();
+    mgr->Close();
 
   } else if (get_direction() == SG_IO_OUT) {
 
-    globals->get_multiplayer_mgr()->Close();
+    mgr->Close();
 
   }
 

Reply via email to