[core] Changed video mutex to recursive and lock it in GUI_Drawable.

Author: DC-SWAT

Makefile

@@ -15,7 +15,7 @@ VER_MAJOR = 4
 VER_MINOR = 0
 VER_MICRO = 3
 # Build types: 0x0N - Alpha, 0x1N - Beta, 0x2N - RC, 0x3N - Release
-VER_BUILD = 0x12
+VER_BUILD = 0x13
 
 BUILD_TYPE_BASE = $(if $(filter 0x3%,$(VER_BUILD)),Release,$(if $(filter 0x2%,$(VER_BUILD)),RC,$(if $(filter 0x1%,$(VER_BUILD)),Beta,$(if $(filter 0x0%,$(VER_BUILD)),Alpha,Release))))
 BUILD_NUM = $(lastword $(subst 0x2,,$(subst 0x1,,$(subst 0x0,,$(subst 0x3,,$(VER_BUILD))))))

lib/SDL_gui/Drawable.cc

@@ -4,6 +4,11 @@
 
 #include "SDL_gui.h"
 
+extern "C" {
+	void LockVideo();
+	void UnlockVideo();
+}
+
 
 static int Inside(int x, int y, SDL_Rect *r)
 {
@@ -307,14 +312,18 @@ void GUI_Drawable::DoUpdate(int force)
 		force = 1;
 	}
 	Update(force);
-	flags &= ~WIDGET_CHANGED;
+	if(flags & WIDGET_CHANGED) {
+		flags &= ~WIDGET_CHANGED;
+	}
 }
 
 /* mark as changed so it will be drawn in the next update */
 
 void GUI_Drawable::MarkChanged()
 {
+	LockVideo();
 	flags |= WIDGET_CHANGED;
+	UnlockVideo();
 }
 
 /* tile an image over an area on a widget */

src/video.c

@@ -338,7 +338,7 @@ int VideoIsLocked() {
 }
 
 int VideoMustLock() {
-	return (video_inited && video_thd != thd_get_current());
+	return video_inited;
 }
 
 void LockVideo() { 
@@ -476,7 +476,7 @@ int InitVideo(int w, int h, int bpp) {
 		video_dma = 0;
 	}
 
-	mutex_init((mutex_t *)&video_mutex, MUTEX_TYPE_NORMAL);
+	mutex_init(&video_mutex, MUTEX_TYPE_RECURSIVE);
 	return 1; 
 }