[Scummvm-cvs-logs] scummvm-tools master -> 830e506b6b5adc9a1223af142912758a57289254
criezy
criezy at scummvm.org
Sun Apr 20 16:03:33 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
830e506b6b SCUMM: Fix issue when running compress_scumm_san more than once
Commit: 830e506b6b5adc9a1223af142912758a57289254
https://github.com/scummvm/scummvm-tools/commit/830e506b6b5adc9a1223af142912758a57289254
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2014-04-20T15:03:14+01:00
Commit Message:
SCUMM: Fix issue when running compress_scumm_san more than once
In the GUI tool, a tool can be executed more than once. However
compress_scumm_san was not closing a file which caused all but the
first execution to fail.
Changed paths:
NEWS
engines/scumm/compress_scumm_san.cpp
diff --git a/NEWS b/NEWS
index 340b864..1680e88 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ For a more comprehensive changelog of the latest experimental code, see:
files are in the Clusters, Music and Speech sub-directories).
- Fix issue with output file name in compress_sword2 tool when specifying an
output directory (the output file name was empty with only an extension).
+ - Fix issue when trying to use compress_scumm_san more than once in the GUI
+ tool.
1.6.0 (2013-05-31)
- Fix crash when compiling with wxWidgets 2.9.
diff --git a/engines/scumm/compress_scumm_san.cpp b/engines/scumm/compress_scumm_san.cpp
index 5fd6a4d..406c894 100644
--- a/engines/scumm/compress_scumm_san.cpp
+++ b/engines/scumm/compress_scumm_san.cpp
@@ -760,6 +760,7 @@ skip:
encodeSanWaveWithOgg(tmpPath);
else
encodeSanWaveWithLame(tmpPath);
+ _waveTmpFile.close();
tmpPath += ".raw";
Common::removeFile(tmpPath.c_str());
}
More information about the Scummvm-git-logs
mailing list