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

Merge pull request #8252 from Mailaender/legacy-map-dispose-stream

Browse Source 
Fixed missing dispose on stream in LegacyMapImporter
This commit is contained in:
Oliver Brakmann
2015-05-25 16:42:41 +02:00
parent a060675951 b4a67f412e
commit 9ec7f00635
1 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs
View File

@@ -132,7 +132,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
public void ConvertIniMap(string iniFile) public void ConvertIniMap(string iniFile)
{ {
var file = new IniFile(GlobalFileSystem.Open(iniFile)); using (var stream = GlobalFileSystem.Open(iniFile))
{
var file = new IniFile(stream);
var basic = file.GetSection("Basic"); var basic = file.GetSection("Basic");
var mapSection = file.GetSection("Map"); var mapSection = file.GetSection("Map");
var legacyMapFormat = (IniMapFormat)Exts.ParseIntegerInvariant(basic.GetValue("NewINIFormat", "0")); var legacyMapFormat = (IniMapFormat)Exts.ParseIntegerInvariant(basic.GetValue("NewINIFormat", "0"));
@@ -214,6 +216,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
LoadPlayer(file, p, legacyMapFormat == IniMapFormat.RedAlert); LoadPlayer(file, p, legacyMapFormat == IniMapFormat.RedAlert);
map.PlayerDefinitions = mapPlayers.ToMiniYaml(); map.PlayerDefinitions = mapPlayers.ToMiniYaml();
} }
}
static int2 LocationFromMapOffset(int offset, int mapSize) static int2 LocationFromMapOffset(int offset, int mapSize)
{ {