[Scummvm-git-logs] scummvm master -> 60a4438309bf90b299e9c065698b68dca98530df

[djsrv]

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:
035633dc1f DIRECTOR: LINGO: Don't append extra .txt in FileIO
60a4438309 DIRECTOR: LINGO: Fix FileIO append mode


Commit: 035633dc1fab484816deb403d2b405734a13677a
    https://github.com/scummvm/scummvm/commit/035633dc1fab484816deb403d2b405734a13677a
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-11T18:34:54-04:00

Commit Message:
DIRECTOR: LINGO: Don't append extra .txt in FileIO

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 a27eae62a2..7c38fd4076 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -142,7 +142,7 @@ void FileIO::m_new(int nargs) {
 			return;
 		}
 		filename = browser.getResult();
-	} else {
+	} else if (!filename.hasSuffixIgnoreCase(".txt")) {
 		filename += ".txt";
 	}
 


Commit: 60a4438309bf90b299e9c065698b68dca98530df
    https://github.com/scummvm/scummvm/commit/60a4438309bf90b299e9c065698b68dca98530df
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-11T18:34:55-04:00

Commit Message:
DIRECTOR: LINGO: Fix FileIO append mode

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 7c38fd4076..b7f03bf480 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -171,17 +171,19 @@ void FileIO::m_new(int nargs) {
 			g_lingo->push(Datum(kErrorIO));
 			return;
 		}
-		me->outFile = g_system->getSavefileManager()->openForSaving(filename, false);
 		me->outStream = new Common::MemoryWriteStreamDynamic(DisposeAfterUse::YES);
+		byte b = inFile->readByte();
+		while (!inFile->eos() && !inFile->err()) {
+			me->outStream->writeByte(b);
+			b = inFile->readByte();
+		}
+		delete inFile;
+		me->outFile = g_system->getSavefileManager()->openForSaving(filename, false);
 		if (!me->outFile) {
 			delete me;
 			g_lingo->push(Datum(kErrorIO));
 			return;
 		}
-		while (!inFile->eos() && !inFile->err()) {
-			me->outStream->writeByte(inFile->readByte());
-		}
-		delete inFile;
 	} else {
 		error("Unsupported FileIO option: '%s'", option.c_str());
 	}