[Scummvm-git-logs] scummvm master -> 00b0c3b474313c540686b07e37a6d4dcf7ce9ca8

sev- sev at scummvm.org
Sun Jul 19 15:32:52 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:
00b0c3b474 DIRECTOR: Sanity check for Channel::isActiveText()


Commit: 00b0c3b474313c540686b07e37a6d4dcf7ce9ca8
    https://github.com/scummvm/scummvm/commit/00b0c3b474313c540686b07e37a6d4dcf7ce9ca8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-19T17:32:25+02:00

Commit Message:
DIRECTOR: Sanity check for Channel::isActiveText()

Changed paths:
    engines/director/channel.cpp


diff --git a/engines/director/channel.cpp b/engines/director/channel.cpp
index ff58d535df..a21bf9866e 100644
--- a/engines/director/channel.cpp
+++ b/engines/director/channel.cpp
@@ -142,7 +142,7 @@ bool Channel::isActiveText() {
 	if (_sprite->_spriteType != kTextSprite)
 		return false;
 
-	if (_sprite->_cast->_widget && _sprite->_cast->_widget->hasAllFocus())
+	if (_sprite->_cast && _sprite->_cast->_widget && _sprite->_cast->_widget->hasAllFocus())
 		return true;
 
 	return false;




More information about the Scummvm-git-logs mailing list