[Scummvm-cvs-logs] scummvm master -> 211842c2fbb79d53ed62b8f88e44fd2290512bd5

[clone2727]

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:
211842c2fb SCUMM: Make sure finalize is called from o60_closeFile()


Commit: 211842c2fbb79d53ed62b8f88e44fd2290512bd5
    https://github.com/scummvm/scummvm/commit/211842c2fbb79d53ed62b8f88e44fd2290512bd5
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-04-01T19:52:12-07:00

Commit Message:
SCUMM: Make sure finalize is called from o60_closeFile()

Changed paths:
    engines/scumm/he/script_v60he.cpp



diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 9d62a31..7ecabd5 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -741,10 +741,14 @@ void ScummEngine_v60he::o60_openFile() {
 void ScummEngine_v60he::o60_closeFile() {
 	int slot = pop();
 	if (0 <= slot && slot < 17) {
-		delete _hInFileTable[slot];
-		delete _hOutFileTable[slot];
+		if (_hOutFileTable[slot]) {
+			_hOutFileTable[slot]->finalize();
+			delete _hOutFileTable[slot];
+			_hOutFileTable[slot] = 0;
+		}
+
+		delete _hInFileTable[slot];		
 		_hInFileTable[slot] = 0;
-		_hOutFileTable[slot] = 0;
 	}
 }