[Scummvm-git-logs] scummvm branch-2-7 -> a4597ed9c3393c499b6b4faa604839e2855d9c05

[sev-]

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:
a4597ed9c3 SCUMM: Fix crash when compressded files are detected


Commit: a4597ed9c3393c499b6b4faa604839e2855d9c05
    https://github.com/scummvm/scummvm/commit/a4597ed9c3393c499b6b4faa604839e2855d9c05
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-19T15:48:50+01:00

Commit Message:
SCUMM: Fix crash when compressded files are detected

We call Dialog::runModal() which in turn, calls pauseEngine().

At this point, SMUSH player is not yet initialized, but our implementation
calls _splayer->pause() which leads to a crash on Android.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 642860c9f36..e3a7d7550a0 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -3338,10 +3338,12 @@ void ScummEngine::pauseEngineIntern(bool pause) {
 
 #ifdef ENABLE_SCUMM_7_8
 void ScummEngine_v7::pauseEngineIntern(bool pause) {
-	if (pause) {
-		_splayer->pause();
-	} else {
-		_splayer->unpause();
+	if (_splayer) { // We may call it from setupScumm() before _splayer is inited
+		if (pause) {
+			_splayer->pause();
+		} else {
+			_splayer->unpause();
+		}
 	}
 
 	ScummEngine::pauseEngineIntern(pause);