From 286372fedf5bd89a71710cd7c17227f05642ac22 Mon Sep 17 00:00:00 2001 From: RoosterDragon Date: Sun, 6 Sep 2015 19:55:00 +0100 Subject: [PATCH] Dispose earlier in FixClassicTilesets. Ensure we dispose the stream we opened right away to avoid leaving it open when an exception occurs. --- OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs b/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs index 732b558891..904e8157f2 100644 --- a/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs +++ b/OpenRA.Mods.Common/UtilityCommands/FixClassicTilesets.cs @@ -54,7 +54,9 @@ namespace OpenRA.Mods.Common.UtilityCommands foreach (var ext in exts) { Stream s; - if (!GlobalFileSystem.TryOpen(template.Images[0] + ext, out s)) + if (GlobalFileSystem.TryOpen(template.Images[0] + ext, out s)) + s.Dispose(); + else continue; // Rewrite the template image (normally readonly) using reflection @@ -91,8 +93,6 @@ namespace OpenRA.Mods.Common.UtilityCommands if (template.TilesCount > 1 && template.Size == single) pickAnyField.SetValue(template, true); - - s.Dispose(); } }