Browse Source

Fixed crash when trying to disconnect secondary display on iOS

(cherry picked from commit 934d6954e21a816c1b28f8499e5b7d976cecd2b8)
Deve 6 months ago
parent
commit
1650c0289d
2 changed files with 3 additions and 0 deletions
  1. 2 0
      src/video/SDL_video.c
  2. 1 0
      src/video/uikit/SDL_uikitmodes.m

+ 2 - 0
src/video/SDL_video.c

@@ -688,7 +688,9 @@ void SDL_DelVideoDisplay(int index)
     SDL_SendDisplayEvent(&_this->displays[index], SDL_DISPLAYEVENT_DISCONNECTED, 0);
 
     SDL_free(_this->displays[index].driverdata);
+    _this->displays[index].driverdata = NULL;
     SDL_free(_this->displays[index].name);
+    _this->displays[index].name = NULL;
     if (index < (_this->num_displays - 1)) {
         SDL_memmove(&_this->displays[index], &_this->displays[index + 1], (_this->num_displays - index - 1) * sizeof(_this->displays[index]));
     }

+ 1 - 0
src/video/uikit/SDL_uikitmodes.m

@@ -344,6 +344,7 @@ void UIKit_DelDisplay(UIScreen *uiscreen)
 
         if (data && data.uiscreen == uiscreen) {
             CFRelease(SDL_GetDisplayDriverData(i));
+            SDL_GetDisplay(i)->driverdata = NULL;
             SDL_DelVideoDisplay(i);
             return;
         }