gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions 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.
This commit is contained in:
Sam Lantinga
2023-08-01 18:28:55 -07:00
parent a509771a87
commit 07578fde3d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,10 +357,19 @@ static void WIN_AddDisplay(SDL_VideoDevice *_this, HMONITOR hMonitor, const MONI
SDL_bool moved = (index != i); SDL_bool moved = (index != i);
SDL_bool changed_bounds = SDL_FALSE; SDL_bool changed_bounds = SDL_FALSE;
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) { if (moved) {
SDL_VideoDisplay tmp; SDL_VideoDisplay tmp;
SDL_assert(index < _this->num_displays);
SDL_memcpy(&tmp, &_this->displays[index], sizeof(tmp)); SDL_memcpy(&tmp, &_this->displays[index], sizeof(tmp));
SDL_memcpy(&_this->displays[index], &_this->displays[i], sizeof(tmp)); SDL_memcpy(&_this->displays[index], &_this->displays[i], sizeof(tmp));
SDL_memcpy(&_this->displays[i], &tmp, sizeof(tmp)); SDL_memcpy(&_this->displays[i], &tmp, sizeof(tmp));