Skip to content

Fix game crashing when no displays are connected #6691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peppy merged 1 commit into from
Jan 9, 2026
+25 −5
Merged

Fix game crashing when no displays are connected #6691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions osu.Framework/Platform/SDL2/SDL2Window_Windowing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,18 @@ public WindowState WindowState
/// </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>
Expand All @@ -328,7 +338,7 @@ private static ImmutableArray<Display> getSDLDisplays()
{
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);
Expand Down
14 changes: 12 additions & 2 deletions osu.Framework/Platform/SDL3/SDL3Window_Windowing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,18 @@ public WindowState WindowState
/// </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>
Expand Down
Loading