[Flightgear-devel] [PATCH] Very minor fix

2006-04-23 Thread Pigeon

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 -  1.12
+++ src/Network/multiplay.cxx   23 Apr 2006 07:59:41 -
@@ -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();
 
   }
 


Re: [Flightgear-devel] [PATCH] Very minor fix

2006-04-23 Thread Mathias Fröhlich

Hi,

On Sunday 23 April 2006 10:01, Pigeon wrote:
 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.
Thanks, is applied!

Mathias

-- 
Mathias Fröhlich, email: [EMAIL PROTECTED]


---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid0709bid3057dat1642
___
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel