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

Don't process images with the wrong pixel format in MapCache.

Browse Source
This commit is contained in:
RoosterDragon
2015-04-11 15:20:16 +01:00
parent 7883355481
commit c1787a8368
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
@@ -174,6 +175,11 @@ namespace OpenRA
createdPreview = true; createdPreview = true;
bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[p.Map.Tileset], p.Map, modData.DefaultRules, true); bitmap = Minimap.RenderMapPreview(modData.DefaultRules.TileSets[p.Map.Tileset], p.Map, modData.DefaultRules, true);
} }
else if (bitmap.PixelFormat != PixelFormat.Format32bppArgb)
{
Log.Write("debug", "Discarding invalid map preview for {0}", p.Uid);
continue;
}
// Note: this is not generally thread-safe, but it works here because: // Note: this is not generally thread-safe, but it works here because:
// (a) This worker is the only thread writing to this sheet // (a) This worker is the only thread writing to this sheet