From 15eb435929f14ac1e4fab2f4dd4495ff4a4559d7 Mon Sep 17 00:00:00 2001 From: Adam <893184+NotAdam@users.noreply.github.com> Date: Tue, 29 Dec 2020 18:28:03 +1100 Subject: [PATCH] well that's dumb --- Penumbra/Importer/TexToolsImport.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Penumbra/Importer/TexToolsImport.cs b/Penumbra/Importer/TexToolsImport.cs index 175e5bcb..49ef3c63 100644 --- a/Penumbra/Importer/TexToolsImport.cs +++ b/Penumbra/Importer/TexToolsImport.cs @@ -216,17 +216,17 @@ namespace Penumbra.Importer } } - private static MemoryStream GetStreamFromZipEntry( ZipFile file, ZipEntry entry ) + private static Stream GetStreamFromZipEntry( ZipFile file, ZipEntry entry ) { - var stream = new MemoryStream(); - using var s = file.GetInputStream( entry ); - s.CopyTo( stream ); - return stream; + return file.GetInputStream( entry ); } private static string GetStringFromZipEntry( ZipFile file, ZipEntry entry, Encoding encoding ) { - return encoding.GetString( GetStreamFromZipEntry( file, entry ).ToArray() ); + using var ms = new MemoryStream(); + using var s = GetStreamFromZipEntry( file, entry ); + s.CopyTo( ms ); + return encoding.GetString( ms.ToArray() ); } private static SqPackStream GetSqPackStreamFromZipEntry( ZipFile file, ZipEntry entry )