[Scummvm-git-logs] scummvm master -> 02682424609b74ab286fd8ce4aac0bb81f512e4d

sluicebox noreply at scummvm.org
Sat Dec 9 22:25:40 UTC 2023


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

Summary:
0268242460 MOHAWK: LB: Fix crash when displaying debugger


Commit: 02682424609b74ab286fd8ce4aac0bb81f512e4d
    https://github.com/scummvm/scummvm/commit/02682424609b74ab286fd8ce4aac0bb81f512e4d
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-12-09T14:25:01-08:00

Commit Message:
MOHAWK: LB: Fix crash when displaying debugger

Fixes calling `error` before setting `_video`.

Fixes the segmentation fault in bug #13920, which should have displayed
the debugger with the intended error message.

Changed paths:
    engines/mohawk/livingbooks.cpp


diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 87f19b4b9f7..003bae180eb 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -289,9 +289,13 @@ void MohawkEngine_LivingBooks::pauseEngineIntern(bool pause) {
 	MohawkEngine::pauseEngineIntern(pause);
 
 	if (pause) {
-		_video->pauseVideos();
+		if (_video != nullptr) {
+			_video->pauseVideos();
+		}
 	} else {
-		_video->resumeVideos();
+		if (_video != nullptr) {
+			_video->resumeVideos();
+		}
 		_system->updateScreen();
 	}
 }




More information about the Scummvm-git-logs mailing list