claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ArchiveTools] Fix TZip write

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-20 23:25:10 -07:00
parent 6b59910534
commit c71b60d2d2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -2763,6 +2763,9 @@ namespace SabreTools.Helper.Tools
return success; return success;
} }
// Set the stream position
inputStream.Seek(0, SeekOrigin.Begin);
// Get the output archive name from the first rebuild rom // Get the output archive name from the first rebuild rom
string archiveFileName = Path.Combine(outDir, Style.RemovePathUnsafeCharacters(rom.Machine.Name) + (rom.Machine.Name.EndsWith(".zip") ? "" : ".zip")); string archiveFileName = Path.Combine(outDir, Style.RemovePathUnsafeCharacters(rom.Machine.Name) + (rom.Machine.Name.EndsWith(".zip") ? "" : ".zip"));
@@ -2823,7 +2826,7 @@ namespace SabreTools.Helper.Tools
Dictionary<string, int> inputIndexMap = new Dictionary<string, int>(); Dictionary<string, int> inputIndexMap = new Dictionary<string, int>();
// If the old one doesn't contain the new file, then add it // If the old one doesn't contain the new file, then add it
if (oldZipFile.Contains(rom.Name.Replace('\\', '/'))) if (!oldZipFile.Contains(rom.Name.Replace('\\', '/')))
{ {
inputIndexMap.Add(rom.Name.Replace('\\', '/'), -1); inputIndexMap.Add(rom.Name.Replace('\\', '/'), -1);
} }
@@ -2917,6 +2920,7 @@ namespace SabreTools.Helper.Tools
} }
finally finally
{ {
inputStream?.Dispose();
zipFile.Dispose(); zipFile.Dispose();
oldZipFile.Dispose(); oldZipFile.Dispose();
} }