mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always Use Next Display Index

Browse Source 
WIN_AddDisplay asserted that the returned index is the expected next
one in the list. This can be an unexpected number when displays are
add and removed in a batch (eg, Remote Desktop disconnect and reconnect).
Instead always just make use of the next index, even if it is not the
expected next index value. This fixes issue #9105

(cherry picked from commit bee8874629)
This commit is contained in:
jimtahu
2024-11-15 14:48:53 -06:00
committed by Sam Lantinga
parent 6dcf75710c
commit d1af211010
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/windows/SDL_windowsmodes.c
View File

@@ -355,11 +355,10 @@ static void WIN_AddDisplay(_THIS, HMONITOR hMonitor, const MONITORINFOEXW *info,
display.driverdata = displaydata; display.driverdata = displaydata;
WIN_GetDisplayBounds(_this, &display, &displaydata->bounds); WIN_GetDisplayBounds(_this, &display, &displaydata->bounds);
index = SDL_AddVideoDisplay(&display, send_event); index = SDL_AddVideoDisplay(&display, send_event);
SDL_assert(index == *display_index);
SDL_free(display.name); SDL_free(display.name);
done: done:
*display_index += 1; *display_index = index + 1;
} }
typedef struct _WIN_AddDisplaysData typedef struct _WIN_AddDisplaysData