[Scummvm-git-logs] scummvm master -> 62069d33c81836ab0e7ed70e128f3f8f6f3e39d9

sev- sev at scummvm.org
Tue Nov 19 22:51:05 UTC 2019


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:
62069d33c8 PINK: Fix crash when switching the countries in selector


Commit: 62069d33c81836ab0e7ed70e128f3f8f6f3e39d9
    https://github.com/scummvm/scummvm/commit/62069d33c81836ab0e7ed70e128f3f8f6f3e39d9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-19T23:50:40+01:00

Commit Message:
PINK: Fix crash when switching the countries in selector

Changed paths:
    engines/pink/objects/actions/action_play_with_sfx.cpp


diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp
index 0ebb869..53f4316 100644
--- a/engines/pink/objects/actions/action_play_with_sfx.cpp
+++ b/engines/pink/objects/actions/action_play_with_sfx.cpp
@@ -76,7 +76,7 @@ void ActionPlayWithSfx::end() {
 	ActionCEL::end();
 	debugC(6, kPinkDebugActions, "ActionPlayWithSfx %s of Actor %s is ended", _name.c_str(), _actor->getName().c_str());
 	// original bug fix
-	if (_actor->getPage()->getSequencer()->isSkipping()) {
+	if (_actor->getPage()->getSequencer() && _actor->getPage()->getSequencer()->isSkipping()) {
 		for (uint i = 0; i < _sfxArray.size(); ++i) {
 			_sfxArray[i]->end();
 		}




More information about the Scummvm-git-logs mailing list