[Scummvm-git-logs] scummvm master -> 9bd0c354c54e6fe1337ec81dcb6bcf0cdde1ded5

[bluegr]

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:
9bd0c354c5 PINK: Handle non-existent pages on scene change - bug #15149


Commit: 9bd0c354c54e6fe1337ec81dcb6bcf0cdde1ded5
    https://github.com/scummvm/scummvm/commit/9bd0c354c54e6fe1337ec81dcb6bcf0cdde1ded5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-11T20:17:24+02:00

Commit Message:
PINK: Handle non-existent pages on scene change - bug #15149

A non-existent page is provided after the girl turns into a mermaid in
Hokus Pokus Pink. We now handle this case without crashing, although
the scene transition is different than how the original handles such
errors

Changed paths:
    engines/pink/objects/module.cpp


diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp
index a8485fbe4db..a91fb4213b6 100644
--- a/engines/pink/objects/module.cpp
+++ b/engines/pink/objects/module.cpp
@@ -56,7 +56,8 @@ void Module::init(bool isLoadingSave, const Common::String &pageName) {
 	// 1 0 - from save
 	if (!pageName.empty())
 		_page = findPage(pageName);
-	else if (!_page)
+
+	if (!_page)
 		_page = _pages[0];
 
 	_page->init(isLoadingSave);