[Scummvm-git-logs] scummvm master -> ba1650ac45bc7df0a5e30f4094af0e83dd9b435a

npjg nathanael.gentrydb8 at gmail.com
Wed Jun 24 16:49:42 UTC 2020


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:
ba1650ac45 DIRECTOR: Don't crash on null surfaces


Commit: ba1650ac45bc7df0a5e30f4094af0e83dd9b435a
    https://github.com/scummvm/scummvm/commit/ba1650ac45bc7df0a5e30f4094af0e83dd9b435a
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-06-24T12:49:00-04:00

Commit Message:
DIRECTOR: Don't crash on null surfaces

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 0d5906e334..419827e556 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -134,6 +134,10 @@ struct {
 void Score::playTransition(uint16 transDuration, uint8 transArea, uint8 transChunkSize, TransitionType transType) {
 	// Play a transition and return the number of subframes rendered
 
+	// HACK: Prevent the tests from crashing
+	if (!_backSurface || !_backSurface2)
+		return;
+
 	TransParams t;
 
 	t.type = transType;




More information about the Scummvm-git-logs mailing list