From 5d3cf61e8bb0072a4cba43ba63e5f9080d468f7f Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 20 Feb 2023 10:38:13 -0800
Subject: [PATCH] Don't call SDL_GetDisplayIndex(0) when creating or
positioning a window
Fixes https://github.com/libsdl-org/SDL/issues/7354
---
src/video/SDL_video.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 2fafdf5a26bf..2c09204f8f0c 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -1663,7 +1663,7 @@ SDL_Window *SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint
} else if ((SDL_WINDOWPOS_ISUNDEFINED(y) || SDL_WINDOWPOS_ISCENTERED(y)) && (y & 0xFFFF)) {
displayID = (y & 0xFFFF);
}
- if (SDL_GetDisplayIndex(displayID) < 0) {
+ if (displayID == 0 || SDL_GetDisplayIndex(displayID) < 0) {
displayID = SDL_GetPrimaryDisplay();
}
@@ -2167,7 +2167,7 @@ int SDL_SetWindowPosition(SDL_Window *window, int x, int y)
} else if (SDL_WINDOWPOS_ISCENTERED(y) && (y & 0xFFFF)) {
displayID = (y & 0xFFFF);
}
- if (SDL_GetDisplayIndex(displayID) < 0) {
+ if (displayID == 0 || SDL_GetDisplayIndex(displayID) < 0) {
displayID = SDL_GetPrimaryDisplay();
}