Fix for crash during cyborg combat.

fixes 204 and 218 - from chmmravatar


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@856 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/ChangeLog

@@ -1,4 +1,5 @@
 Changes towards version 0.3:
+- Fix lockup in cyborg melee (fixes 204 and 218) from chmmravatar
 - Added -g option to control gamma correction, from chmmravatar
 - Restored the CondBank to actually use condition variables properly
   (resolves a race condition under OpenBSD)

sc2/src/sc2code/libs/graphics/sdl/sdl_common.c

@@ -509,6 +509,7 @@ TFB_FlushGraphics () // Only call from main thread!!
 				int x = DC.data.image.x;
 				int y = DC.data.image.y;
 
+				LockMutex (DC_image->mutex);
 				if (DC.data.image.scale)
 					TFB_BBox_RegisterCanvas (DC_image->ScaledImg, x, y);
 				else
@@ -522,6 +523,7 @@ TFB_FlushGraphics () // Only call from main thread!!
 				{
 					pal = DC_image->Palette;
 				}
+				UnlockMutex (DC_image->mutex);
 
 				TFB_DrawCanvas_Image (DC_image, x, y,
 						DC.data.image.scale, pal,