WAGE: Avoid potential race condition in cursor drawing code

2 files changed, 17 insertions, 1 deletions

diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 819f5881c4..5267e4ee5d 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -131,7 +131,12 @@ static void cursorTimerHandler(void *refCon) {
 	if (!gui->_cursorOff)
 		gui->_cursorState = !gui->_cursorState;
 
-	g_system->copyRectToScreen(gui->_screen.getBasePtr(x, y), gui->_screen.pitch, x, y, 1, kCursorHeight);
+	gui->_cursorRect.left = x;
+	gui->_cursorRect.right = x + 1;
+	gui->_cursorRect.top = y;
+	gui->_cursorRect.bottom = y + kCursorHeight;
+
+	gui->_cursorDirty = true;
 }
 
 Gui::Gui(WageEngine *engine) {
@@ -141,6 +146,7 @@ Gui::Gui(WageEngine *engine) {
 	_consoleDirty = true;
 	_bordersDirty = true;
 	_menuDirty = true;
+	_cursorDirty = false;
 	_consoleFullRedraw = true;
 	_screen.create(g_system->getWidth(), g_system->getHeight(), Graphics::PixelFormat::createFormatCLUT8());
 
@@ -252,6 +258,13 @@ void Gui::draw() {
 	if (_menuDirty)
 		_menu->render();
 
+	if (_cursorDirty) {
+		g_system->copyRectToScreen(_screen.getBasePtr(_cursorRect.left, _cursorRect.top), _screen.pitch,
+				_cursorRect.left, _cursorRect.top, _cursorRect.width(), _cursorRect.height());
+
+		_cursorDirty = false;
+	}
+
 	_sceneDirty = false;
 	_consoleDirty = false;
 	_bordersDirty = false;
diff --git a/engines/wage/gui.h b/engines/wage/gui.h
index f679faa5cd..8cdc827bf0 100644
--- a/engines/wage/gui.h
+++ b/engines/wage/gui.h
@@ -138,6 +138,9 @@ public:
 
 	Patterns _patterns;
 
+	bool _cursorDirty;
+	Common::Rect _cursorRect;
+
 private:
 	Graphics::Surface _console;
 	Menu *_menu;