[Scummvm-git-logs] scummvm master -> 1243acfd3ae111983227bf964836b4e8fb624bc3

djsrv dservilla at gmail.com
Tue Jul 28 15:51:33 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:
1243acfd3a DIRECTOR: LINGO: Don't tell movie-less window


Commit: 1243acfd3ae111983227bf964836b4e8fb624bc3
    https://github.com/scummvm/scummvm/commit/1243acfd3ae111983227bf964836b4e8fb624bc3
Author: djsrv (dservilla at gmail.com)
Date: 2020-07-28T11:51:10-04:00

Commit Message:
DIRECTOR: LINGO: Don't tell movie-less window

Changed paths:
    engines/director/lingo/lingo-code.cpp


diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index 98813f9430..47357ec189 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -1342,6 +1342,10 @@ void LC::c_tell() {
 		warning("c_tell(): wrong argument type: %s", window.type2str());
 		return;
 	}
+	if (static_cast<Stage *>(window.u.obj)->getCurrentMovie() == nullptr) {
+		warning("c_tell: window has no movie");
+		return;
+	}
 	g_director->setCurrentStage(static_cast<Stage *>(window.u.obj));
 
 }




More information about the Scummvm-git-logs mailing list