[Scummvm-git-logs] scummvm master -> adb2ef6df704b6a57290e52b39ea2392bf9f4aec

[sev-]

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:
dd4f58e9d4 FULLPIPE: Fix errorneous message queue cleanup
adb2ef6df7 FULLPIPE: Fix crash when savepath is not writeable


Commit: dd4f58e9d4042a98dc9ad1263f3c571714e86f36
    https://github.com/scummvm/scummvm/commit/dd4f58e9d4042a98dc9ad1263f3c571714e86f36
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-21T21:59:35+02:00

Commit Message:
FULLPIPE: Fix errorneous message queue cleanup

Changed paths:
    engines/fullpipe/messages.cpp



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index 68ceae3..a9fc521 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -502,6 +502,9 @@ bool MessageQueue::checkGlobalExCommandList1() {
 			if (ex1->_messageKind != 1 && ex1->_messageKind != 20 && ex1->_messageKind != 5 && ex1->_messageKind != 27)
 				continue;
 
+			if (ex1->_parentId != ex->_parentId)
+				continue;
+
 			if (ex1->_param != ex->_param && ex1->_param != -1 && ex->_param != -1)
 				continue;
 
@@ -533,6 +536,11 @@ bool MessageQueue::checkGlobalExCommandList2() {
 				continue;
 			}
 
+			if (ex1->_parentId != ex->_parentId) {
+				it++;
+				continue;
+			}
+
 			if (ex1->_param != ex->_param && ex1->_param != -1 && ex->_param != -1) {
 				it++;
 				continue;


Commit: adb2ef6df704b6a57290e52b39ea2392bf9f4aec
    https://github.com/scummvm/scummvm/commit/adb2ef6df704b6a57290e52b39ea2392bf9f4aec
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-21T21:59:35+02:00

Commit Message:
FULLPIPE: Fix crash when savepath is not writeable

Changed paths:
    engines/fullpipe/statesaver.cpp



diff --git a/engines/fullpipe/statesaver.cpp b/engines/fullpipe/statesaver.cpp
index eb5de08..c6f4851 100644
--- a/engines/fullpipe/statesaver.cpp
+++ b/engines/fullpipe/statesaver.cpp
@@ -105,6 +105,11 @@ void GameLoader::writeSavegame(Scene *sc, const char *fname) {
 	// Now dump it into save file
 	Common::OutSaveFile *saveFile = g_system->getSavefileManager()->openForSaving(fname);
 
+	if (!saveFile) {
+		warning("Cannot open file for writing: %s", fname);
+		return;
+	}
+
 	saveFile->writeUint32LE(header.version);
 	saveFile->write(header.magic, 32);
 	saveFile->writeUint32LE(header.updateCounter);