[Scummvm-git-logs] scummvm master -> 4d4f2b2549be401122ca07c390543291804284f9

djsrv dservilla at gmail.com
Tue Aug 4 16:01:42 UTC 2020


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:
4d4f2b2549 DIRECTOR: LINGO: Fake dispose FileIO obj on error


Commit: 4d4f2b2549be401122ca07c390543291804284f9
    https://github.com/scummvm/scummvm/commit/4d4f2b2549be401122ca07c390543291804284f9
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-04T12:00:46-04:00

Commit Message:
DIRECTOR: LINGO: Fake dispose FileIO obj on error

It will be disposed for real once the last reference is gone.

Changed paths:
    engines/director/lingo/xlibs/fileio.cpp


diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/fileio.cpp
index 3063be4e18..29fd08a6e7 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -152,7 +152,7 @@ void FileIO::m_new(int nargs) {
 		me->_inStream = me->_inFile;
 		if (!me->_inFile) {
 			saveFileError();
-			delete me;
+			me->dispose();
 			return;
 		}
 	} else if (option.equalsIgnoreCase("write")) {
@@ -162,14 +162,14 @@ void FileIO::m_new(int nargs) {
 		me->_outStream = new Common::MemoryWriteStreamDynamic(DisposeAfterUse::YES);
 		if (!me->_outFile) {
 			saveFileError();
-			delete me;
+			me->dispose();
 			return;
 		}
 	} else if (option.equalsIgnoreCase("append")) {
 		Common::InSaveFile *_inFile = saves->openForLoading(filename);
 		if (!_inFile) {
 			saveFileError();
-			delete me;
+			me->dispose();
 			return;
 		}
 		me->_outStream = new Common::MemoryWriteStreamDynamic(DisposeAfterUse::YES);
@@ -182,7 +182,7 @@ void FileIO::m_new(int nargs) {
 		me->_outFile = saves->openForSaving(filename, false);
 		if (!me->_outFile) {
 			saveFileError();
-			delete me;
+			me->dispose();
 			return;
 		}
 	} else {




More information about the Scummvm-git-logs mailing list