aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-13 11:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6691 from Susko3/fix-zero-displays-crashing-game

Browse Source 
Fix game crashing when no displays are connected
This commit is contained in:
Dean Herbert
2026-01-09 21:04:11 +09:00
committed by GitHub
parent 55317f0f23 0429fe4597
commit 44c42076fa
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Framework/Platform/SDL2/SDL2Window_Windowing.cs
View File

@@ -302,8 +302,18 @@ namespace osu.Framework.Platform.SDL2
/// </remarks>
private void fetchDisplays()
{
Displays = getSDLDisplays();
DisplaysChanged?.Invoke(Displays);
var newDisplays = getSDLDisplays();
if (newDisplays.Length > 0)
{
Displays = newDisplays;
DisplaysChanged?.Invoke(newDisplays);
}
else
{
// keep Displays stale if zero displays are currently detected
Logger.Log("Got zero displays from SDL, ignoring.");
}
}
/// <summary>
@@ -328,7 +338,7 @@ namespace osu.Framework.Platform.SDL2
{
int numDisplays = SDL_GetNumVideoDisplays();
if (numDisplays <= 0)
if (numDisplays < 0)
throw new InvalidOperationException($"Failed to get number of SDL displays. Return code: {numDisplays}. SDL Error: {SDL_GetError()}");
var builder = ImmutableArray.CreateBuilder<Display>(numDisplays);

14
osu.Framework/Platform/SDL3/SDL3Window_Windowing.cs
View File

@@ -306,8 +306,18 @@ namespace osu.Framework.Platform.SDL3
/// </remarks>
private void fetchDisplays()
{
Displays = getSDLDisplays();
DisplaysChanged?.Invoke(Displays);
var newDisplays = getSDLDisplays();
if (newDisplays.Length > 0)
{
Displays = newDisplays;
DisplaysChanged?.Invoke(newDisplays);
}
else
{
// keep Displays stale if zero displays are currently detected
Logger.Log("Got zero displays from SDL, ignoring.");
}
}
/// <summary>