[Scummvm-git-logs] scummvm branch-2-8 -> b0fe62a0f526ffc2e2782aa3bc938b50e7a64e06

[eriktorbjorn]

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

Summary:
49f3ce421a SWORD2: Fix crash when quitting the game while paused (bug #14814)
b0fe62a0f5 NEWS: Mention Broken Sword 2 crash fix


Commit: 49f3ce421a8a77ec7f6c83ba35c9a2953294dfd8
    https://github.com/scummvm/scummvm/commit/49f3ce421a8a77ec7f6c83ba35c9a2953294dfd8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-01-11T18:30:49+01:00

Commit Message:
SWORD2: Fix crash when quitting the game while paused (bug #14814)

If the game is paused when the engine is being destructed, unpause it
immediately. Otherwise, it will happen automatically later when the
engine is in a semi-destructed state, causing it to crash.

Changed paths:
    engines/sword2/sword2.cpp


diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index a020723a795..da4b220826b 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -89,6 +89,11 @@ Sword2Engine::Sword2Engine(OSystem *syst, const ADGameDescription *gameDesc) : E
 }
 
 Sword2Engine::~Sword2Engine() {
+	// Unpause the game now, or it will be done automatically when the
+	// game engine is half-deleted, causing it to crash.
+	if (isPaused())
+		_gamePauseToken.clear();
+
 	//_debugger is deleted by Engine
 	delete _sound;
 	delete _fontRenderer;


Commit: b0fe62a0f526ffc2e2782aa3bc938b50e7a64e06
    https://github.com/scummvm/scummvm/commit/b0fe62a0f526ffc2e2782aa3bc938b50e7a64e06
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-01-11T18:31:53+01:00

Commit Message:
NEWS: Mention Broken Sword 2 crash fix

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 6c241b46f94..db62f8c6ab7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,9 @@ For a more comprehensive changelog of the latest experimental code, see:
  General:
    - Fixed GLSL version parsing on some OpenGL ES2 platforms.
 
+ Broken Sword 2:
+   - Fixed crash when quitting the game while it was paused.
+
  MM:
    - Enabled engine, allowing MM1 and Xeen to be compiled.