r11721 - in packages/trunk/cultivation/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-02-09 08:42:34 +0000 (Wed, 09 Feb 2011)
New Revision: 11721

Added:
   packages/trunk/cultivation/debian/patches/fix_crash.patch
Modified:
   packages/trunk/cultivation/debian/changelog
   packages/trunk/cultivation/debian/patches/series
Log:
Fix a crash when restarting the game (Closes: #597851)

Modified: packages/trunk/cultivation/debian/changelog
===================================================================
--- packages/trunk/cultivation/debian/changelog	2011-02-08 20:44:31 UTC (rev 11720)
+++ packages/trunk/cultivation/debian/changelog	2011-02-09 08:42:34 UTC (rev 11721)
@@ -19,6 +19,7 @@
   * Bump Standards-Version, no changes needed
   * Slightly improve the copyright file
   * Don't link against libX11, it isn't used
+  * Fix a crash when restarting the game (Closes: #597851)
 
  -- Paul Wise <pabs at debian.org>  Sun, 24 Oct 2010 15:18:36 +0800
 

Added: packages/trunk/cultivation/debian/patches/fix_crash.patch
===================================================================
--- packages/trunk/cultivation/debian/patches/fix_crash.patch	                        (rev 0)
+++ packages/trunk/cultivation/debian/patches/fix_crash.patch	2011-02-09 08:42:34 UTC (rev 11721)
@@ -0,0 +1,28 @@
+Description: fix a crash when restarting the game
+Origin: upstream, http://hcsoftware.cvs.sourceforge.net/viewvc/hcsoftware/tempProjects/game2/gameSource/game.cpp?r1=1.155&r2=1.156&view=patch
+Bug-Debian: http://bugs.debian.org/597851
+Author: Jason Rohrer
+--- a/game2/gameSource/game.cpp
++++ b/game2/gameSource/game.cpp
+@@ -1381,12 +1382,20 @@
+         mScreen->removeMouseHandler( mMainPanelGuiTranslator );
+         mScreen->removeKeyboardHandler( mMainPanelGuiTranslator );
+         
+-        
++
++        // prevent bad access from audio thread during deletion and
++        // new construction
++        globalLock.lock();
++
+         delete sceneHandler;
+ 
+         // construt new
+         sceneHandler = new GameSceneHandler( screen );
+ 
++        globalLock.unlock();
++
++
++        
+         sceneHandler->initFromFiles();
+         
+         restartFlag = false;

Modified: packages/trunk/cultivation/debian/patches/series
===================================================================
--- packages/trunk/cultivation/debian/patches/series	2011-02-08 20:44:31 UTC (rev 11720)
+++ packages/trunk/cultivation/debian/patches/series	2011-02-09 08:42:34 UTC (rev 11721)
@@ -1,3 +1,4 @@
 portaudio.patch
 abs_paths.patch
 math_h.patch
+fix_crash.patch