[Scummvm-git-logs] scummvm master -> 422b7aeb91de6e4068a7495a253743577560b37f

[npjg]

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:
422b7aeb91 DIRECTOR: Do not try to draw null shape


Commit: 422b7aeb91de6e4068a7495a253743577560b37f
    https://github.com/scummvm/scummvm/commit/422b7aeb91de6e4068a7495a253743577560b37f
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-09T13:52:17-04:00

Commit Message:
DIRECTOR: Do not try to draw null shape

Changed paths:
    engines/director/director.h
    engines/director/stage.cpp


diff --git a/engines/director/director.h b/engines/director/director.h
index dd873a1a8c..f3c1c278d6 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -130,6 +130,7 @@ struct DirectorPlotData {
 	bool setNeedsColor(); // graphics.cpp
 
 	DirectorPlotData(Graphics::MacWindowManager *w, InkType i, uint b, uint f, uint n) : _wm(w), ink(i), backColor(b), foreColor(f), numColors(n) {
+		isShape = false;
 		manualInk = false;
 
 		applyColor = setNeedsColor();
diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index 93f98e9555..7636519e5d 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -177,6 +177,9 @@ void Stage::inkBlitFrom(Channel *channel, Common::Rect destRect, Graphics::Manag
 void Stage::inkBlitShape(DirectorPlotData *pd, Common::Rect &srcRect) {
 	MacShape *ms = ((MacShape *)pd->src);
 
+	if (!ms)
+		return;
+
 	switch (pd->ink) {
 	case kInkTypeNotTrans:
 	case kInkTypeNotReverse: