Don't call SDL_GetDisplayIndex(0) when creating or positioning a window

Fixes https://github.com/libsdl-org/SDL/issues/7354
main
Sam Lantinga 2023-02-20 10:38:13 -08:00
parent f1202fccdc
commit 5d3cf61e8b
1 changed files with 2 additions and 2 deletions

View File

@ -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)) { } else if ((SDL_WINDOWPOS_ISUNDEFINED(y) || SDL_WINDOWPOS_ISCENTERED(y)) && (y & 0xFFFF)) {
displayID = (y & 0xFFFF); displayID = (y & 0xFFFF);
} }
if (SDL_GetDisplayIndex(displayID) < 0) { if (displayID == 0 || SDL_GetDisplayIndex(displayID) < 0) {
displayID = SDL_GetPrimaryDisplay(); 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)) { } else if (SDL_WINDOWPOS_ISCENTERED(y) && (y & 0xFFFF)) {
displayID = (y & 0xFFFF); displayID = (y & 0xFFFF);
} }
if (SDL_GetDisplayIndex(displayID) < 0) { if (displayID == 0 || SDL_GetDisplayIndex(displayID) < 0) {
displayID = SDL_GetPrimaryDisplay(); displayID = SDL_GetPrimaryDisplay();
} }