[Scummvm-git-logs] scummvm master -> 6cc761e72850320e89d3136da4b4ec686fd784db

[csnover]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
832979c2db SCI: Fix memory leak
6cc761e728 SCI32: Allow 'focused' variable to break out of the event loop


Commit: 832979c2db8d42160887299ffe3d4666f1a7d445
    https://github.com/scummvm/scummvm/commit/832979c2db8d42160887299ffe3d4666f1a7d445
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-09T11:32:01-05:00

Commit Message:
SCI: Fix memory leak

Changed paths:
    engines/sci/engine/kvideo.cpp



diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index ab216c51..83a0288 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -165,7 +165,6 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
 		switch (argv[0].toUint16()) {
 		case 0: {
 			Common::String filename = s->_segMan->getString(argv[1]);
-			videoDecoder = new Video::AVIDecoder();
 
 			if (filename.equalsIgnoreCase("gk2a.avi")) {
 				// HACK: Switch to 16bpp graphics for Indeo3.
@@ -180,6 +179,8 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
 				}
 			}
 
+			videoDecoder = new Video::AVIDecoder();
+
 			if (!videoDecoder->loadFile(filename.c_str())) {
 				warning("Failed to open movie file %s", filename.c_str());
 				delete videoDecoder;


Commit: 6cc761e72850320e89d3136da4b4ec686fd784db
    https://github.com/scummvm/scummvm/commit/6cc761e72850320e89d3136da4b4ec686fd784db
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-10-09T11:41:52-05:00

Commit Message:
SCI32: Allow 'focused' variable to break out of the event loop

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



diff --git a/engines/sci/graphics/controls32.cpp b/engines/sci/graphics/controls32.cpp
index 4ec534f..0cd924b 100644
--- a/engines/sci/graphics/controls32.cpp
+++ b/engines/sci/graphics/controls32.cpp
@@ -160,7 +160,6 @@ reg_t GfxControls32::kernelEditText(const reg_t controlObject) {
 		// Original engine did not have a QUIT event but we have to handle it
 		if (event.type == SCI_EVENT_QUIT) {
 			focused = false;
-			break;
 		} else if (event.type == SCI_EVENT_MOUSE_PRESS && !editorPlaneRect.contains(event.mousePosSci)) {
 			focused = false;
 		} else if (event.type == SCI_EVENT_KEYBOARD) {