[Scummvm-git-logs] scummvm branch-2-9 -> 5756a30b16b108e0d014d2a02740eecd6d3923f7

[mgerhardy]

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

Summary:
5756a30b16 TWINE: LBA: Exiting back to launcher from 2:21 logo screen throws Assertion Failure


Commit: 5756a30b16b108e0d014d2a02740eecd6d3923f7
    https://github.com/scummvm/scummvm/commit/5756a30b16b108e0d014d2a02740eecd6d3923f7
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2025-05-07T09:33:34+02:00

Commit Message:
TWINE: LBA: Exiting back to launcher from 2:21 logo screen throws Assertion Failure

see https://bugs.scummvm.org/ticket/15911

Changed paths:
    engines/twine/movies.cpp


diff --git a/engines/twine/movies.cpp b/engines/twine/movies.cpp
index b566b923759..826444a9dcf 100644
--- a/engines/twine/movies.cpp
+++ b/engines/twine/movies.cpp
@@ -458,7 +458,10 @@ bool Movies::playMovie(const char *name) { // PlayAnimFla
 		warning("Unsupported fla version: %u, %s", version, fileNamePath.c_str());
 	}
 
-	_engine->_screens->fadeToBlack(_paletteOrg);
+	// this might happen if the movie was interrupted before it even started to load the palette.
+	if (!_paletteOrg.empty()) {
+		_engine->_screens->fadeToBlack(_paletteOrg);
+	}
 
 	_engine->_sound->stopSamples();
 	_engine->_screens->setBlackPal();