epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dispose package on exception.

Browse Source
This commit is contained in:
Paul Chote
2016-02-26 21:35:30 +00:00
parent 617113fa86
commit b0f4646b88
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Map/MapCache.cs
View File

@@ -57,17 +57,21 @@ namespace OpenRA
var mapGrid = modData.Manifest.Get<MapGrid>(); var mapGrid = modData.Manifest.Get<MapGrid>();
foreach (var path in mapPaths) foreach (var path in mapPaths)
{ {
IReadOnlyPackage package;
try try
{ {
using (new Support.PerfTimer(path.Key)) using (new Support.PerfTimer(path.Key))
{ {
var package = modData.ModFiles.OpenPackage(path.Key); package = modData.ModFiles.OpenPackage(path.Key);
var uid = Map.ComputeUID(package); var uid = Map.ComputeUID(package);
previews[uid].UpdateFromMap(package, path.Value, modData.Manifest.MapCompatibility, mapGrid.Type); previews[uid].UpdateFromMap(package, path.Value, modData.Manifest.MapCompatibility, mapGrid.Type);
} }
} }
catch (Exception e) catch (Exception e)
{ {
if (package != null)
package.Dispose();
Console.WriteLine("Failed to load map: {0}", path); Console.WriteLine("Failed to load map: {0}", path);
Console.WriteLine("Details: {0}", e); Console.WriteLine("Details: {0}", e);
Log.Write("debug", "Failed to load map: {0}", path); Log.Write("debug", "Failed to load map: {0}", path);