r14205 - packages/trunk/cultivation/debian/patches

[Paul Wise]

Author: pabs
Date: 2013-06-02 06:13:44 +0000 (Sun, 02 Jun 2013)
New Revision: 14205

Modified:
   packages/trunk/cultivation/debian/patches/portaudio19.patch
Log:
Fix segfault on shutdown with portaudio19

Modified: packages/trunk/cultivation/debian/patches/portaudio19.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/portaudio19.patch	2013-06-02 05:20:41 UTC (rev 14204)
+++ packages/trunk/cultivation/debian/patches/portaudio19.patch	2013-06-02 06:13:44 UTC (rev 14205)
@@ -52,3 +52,27 @@
              portaudioCallback,
              (void *)this );  // pass self-pointer to callback function
          
+--- a/game2/gameSource/sound/MusicPlayer.cpp
++++ b/game2/gameSource/sound/MusicPlayer.cpp
+@@ -112,13 +112,14 @@
+ 
+     // get parts and positions of gardeners
+     int numParts = 0;
+-    Vector3D **positions =
+-        globalWorld->getAllGardenerPositions( &numParts );
+-    MusicPart **musicParts =
+-        globalWorld->getAllGardenerMusicParts( &numParts );
+-    double *volumeModifiers =
+-        globalWorld->getAllGardenerMusicVolumeModifiers( &numParts );
+-
++    Vector3D **positions = NULL;
++    MusicPart **musicParts = NULL;
++    double *volumeModifiers = NULL;
++    if ( globalWorld ){
++        positions = globalWorld->getAllGardenerPositions( &numParts );
++        musicParts = globalWorld->getAllGardenerMusicParts( &numParts );
++        volumeModifiers = globalWorld->getAllGardenerMusicVolumeModifiers( &numParts );
++    }
+     
+     // get center position from current player position
+     Vector3D *centerPosition = new Vector3D( &globalPlayerCurrentPosition );