ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-22 16:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash if a display is enumerated twice

Browse source 
This can happen if a monitor is in the process of becoming primary because another monitor was disconnected.

(cherry picked from commit 07578fde3dad2dadd605f5b18399c8d021f6ae5d)
This commit is contained in:
Sam Lantinga 2023-08-01 18:28:55 -07:00
parent dc5dda0f31
commit 2468fccf7f
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/video/windows/SDL_windowsmodes.c
View file

@ -318,10 +318,19 @@ static void WIN_AddDisplay(_THIS, HMONITOR hMonitor, const MONITORINFOEXW *info,
if (SDL_wcscmp(driverdata->DeviceName, info->szDevice) == 0) {
SDL_bool moved = (index != i);
if (driverdata->state != DisplayRemoved) {
/* We've already enumerated this display, don't move it */
return;
}
if (index >= _this->num_displays) {
/* This should never happen due to the check above, but just in case... */
return;
}
if (moved) {
SDL_VideoDisplay tmp;
SDL_assert(index < _this->num_displays);
SDL_memcpy(&tmp, &_this->displays[index], sizeof(tmp));
SDL_memcpy(&_this->displays[index], &_this->displays[i], sizeof(tmp));
SDL_memcpy(&_this->displays[i], &tmp, sizeof(tmp));