thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix crash when compressded files are detected

Browse source 
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.
This commit is contained in:
Eugene Sandulenko 2023-03-19 12:25:44 +01:00
parent acf6280fbe
commit ef9b6c9b45
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/scumm/scumm.cpp
View file

@ -3338,10 +3338,12 @@ void ScummEngine::pauseEngineIntern(bool pause) {
#ifdef ENABLE_SCUMM_7_8 #ifdef ENABLE_SCUMM_7_8
void ScummEngine_v7::pauseEngineIntern(bool pause) { void ScummEngine_v7::pauseEngineIntern(bool pause) {
if (pause) { if (_splayer) { // We may call it from setupScumm() before _splayer is inited
_splayer->pause(); if (pause) {
} else { _splayer->pause();
_splayer->unpause(); } else {
_splayer->unpause();
}
} }
ScummEngine::pauseEngineIntern(pause); ScummEngine::pauseEngineIntern(pause);