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

3
OpenRA.Platforms.Default/Sdl2HardwareCursor.cs
View File

@@ -45,9 +45,6 @@ namespace OpenRA.Platforms.Default
// This call very occasionally fails on Windows, but often works when retried.
for (var retries = 0; retries < 3 && Cursor == IntPtr.Zero; retries++)
Cursor = SDL.SDL_CreateColorCursor(surface, hotspot.X, hotspot.Y);
if (Cursor == IntPtr.Zero)
throw new Sdl2HardwareCursorException($"Failed to create cursor: {SDL.SDL_GetError()}");
}
catch
{

7
OpenRA.Platforms.Default/Sdl2PlatformWindow.cs
View File

@@ -344,11 +344,14 @@ namespace OpenRA.Platforms.Default
hotspot *= 2;
}
return new Sdl2HardwareCursor(size, data, hotspot);
var cursor = new Sdl2HardwareCursor(size, data, hotspot);
return cursor.Cursor == IntPtr.Zero ? null : cursor;
}
catch (Exception ex)
{
throw new Sdl2HardwareCursorException($"Failed to create hardware cursor `{name}` - {ex.Message}", ex);
Log.Write("debug", $"Failed to create hardware cursor `{name}` - {ex.Message}");
Console.WriteLine($"Failed to create hardware cursor `{name}` - {ex.Message}");
return null;
}
}