[Scummvm-git-logs] scummvm master -> 827d43e4e789bda3bb85d437de2cd81cc4f76069

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
827d43e4e7 BAGEL: METAGAME: Fix crash hiding boardgame turn start spinner


Commit: 827d43e4e789bda3bb85d437de2cd81cc4f76069
    https://github.com/scummvm/scummvm/commit/827d43e4e789bda3bb85d437de2cd81cc4f76069
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-02-20T17:06:42+11:00

Commit Message:
BAGEL: METAGAME: Fix crash hiding boardgame turn start spinner

Changed paths:
    NEWS.md
    engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp


diff --git a/NEWS.md b/NEWS.md
index 7fbaffb8160..1f02a97061f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -13,6 +13,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fix shell animations in Mankala minigame.
    - Fixed incorrect evolution logic in Game of Life.
    - Hopeful fix for occasional crash entering boardgame stores.
+   - Fix crash when hiding boardgame turn start spinner
 
  M4:
    - Added music support in Ripley.
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp b/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
index 23ee5fcc4b4..8b1c624e78c 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/spinner.cpp
@@ -271,22 +271,18 @@ void CSpinner::SetupSpinner() {
  ************************************************************************/
 
 int CSpinner::Animate(int nX, int nY) {
-	int     nValue = -1;
-	uint32   goal;
+	int nValue = -1;
 
-	m_nX = nX;                                      // establish position
+	// Establish position
+	m_nX = nX;
 	m_nY = nY;
 
 	AfxGetApp()->DoWaitCursor(1);
 
-	nValue = Spin();                               // spin it and get a result
-	if (nValue > 0) {                              // pause for a moment
-		goal = GetTickCount() + SPINNER_WAIT * 1000L;
-		while (goal > GetTickCount()) {             // handle non-input messages
-			if (HandleMessages())                   // ... and terminate loop if urgent
-				break;
-		}
-		Hide();                              // hide the spinner
+	nValue = Spin();								// Spin it and get a result
+	if (nValue > 0) {
+		g_system->delayMillis(SPINNER_WAIT * 1000);	// Pause for a moment
+		Hide();										// hide the spinner
 	}
 
 	AfxGetApp()->DoWaitCursor(-1);