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

Don't throw an exception when creating a hardware cursor fails

Browse Source
This commit is contained in:
abcdefg30
2021-08-06 01:11:04 +02:00
committed by Paul Chote
parent f63e15f5de
commit b8ba1b36fe
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Graphics/CursorManager.cs
View File

@@ -118,18 +118,13 @@ namespace OpenRA.Graphics
var paddingTL = -(template.Bounds.Location - template.Sprites[i].Offset.XY.ToInt2());
var paddingBR = template.PaddedSize - new int2(template.Sprites[i].Bounds.Size) - paddingTL;
try
var hardwareCursor = CreateHardwareCursor(kv.Key, template.Sprites[i], paddingTL, paddingBR, -template.Bounds.Location);
if (hardwareCursor != null)
template.Cursors[i] = hardwareCursor;
else
{
template.Cursors[i] = CreateHardwareCursor(kv.Key, template.Sprites[i], paddingTL, paddingBR, -template.Bounds.Location);
}
catch (Exception e)
{
Log.Write("debug", "Failed to initialize hardware cursor for {0}.", template.Name);
Log.Write("debug", "Error was: " + e.Message);
Console.WriteLine("Failed to initialize hardware cursor for {0}.", template.Name);
Console.WriteLine("Error was: " + e.Message);
template.Cursors[i] = null;
Log.Write("debug", $"Failed to initialize hardware cursor for {template.Name}.");
Console.WriteLine($"Failed to initialize hardware cursor for {template.Name}.");
}
}
}