Commit 02be870c54392b946fb9b73b243ca8bd52011e26

Sam Lantinga 2023-08-01T18:28:55

Fixed crash if a display is enumerated twice This can happen if a monitor is in the process of becoming primary because another monitor was disconnected. (cherry picked from commit 07578fde3dad2dadd605f5b18399c8d021f6ae5d) (cherry picked from commit 2468fccf7fa7fa315d6652c7babf85f2d09f035b)

diff --git a/src/video/windows/SDL_windowsmodes.c b/src/video/windows/SDL_windowsmodes.c
index 69168c9..438fcbe 100644
--- a/src/video/windows/SDL_windowsmodes.c
+++ b/src/video/windows/SDL_windowsmodes.c
@@ -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));