[Scummvm-cvs-logs] scummvm master -> 6b6ee74f006890834223f28b24fce11a79245bb2

[csnover]

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:
6b6ee74f00 SCI32: Fix crash in Torin when opening save dialog


Commit: 6b6ee74f006890834223f28b24fce11a79245bb2
    https://github.com/scummvm/scummvm/commit/6b6ee74f006890834223f28b24fce11a79245bb2
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-07-30T11:57:50-05:00

Commit Message:
SCI32: Fix crash in Torin when opening save dialog

Changed paths:
    engines/sci/graphics/controls32.cpp



diff --git a/engines/sci/graphics/controls32.cpp b/engines/sci/graphics/controls32.cpp
index 6b91bb4..f4e9d26 100644
--- a/engines/sci/graphics/controls32.cpp
+++ b/engines/sci/graphics/controls32.cpp
@@ -115,7 +115,10 @@ reg_t GfxControls32::kernelEditText(const reg_t controlObject) {
 	reg_t planeObj = readSelector(_segMan, controlObject, SELECTOR(plane));
 	Plane *sourcePlane = g_sci->_gfxFrameout->getVisiblePlanes().findByObject(planeObj);
 	if (sourcePlane == nullptr) {
-		error("Could not find plane %04x:%04x", PRINT_REG(planeObj));
+		sourcePlane = g_sci->_gfxFrameout->getPlanes().findByObject(planeObj);
+		if (sourcePlane == nullptr) {
+			error("Could not find plane %04x:%04x", PRINT_REG(planeObj));
+		}
 	}
 	editorPlaneRect.translate(sourcePlane->_gameRect.left, sourcePlane->_gameRect.top);