From 1f4e86d61cf5de60dfd15655fd714bb79c13addd Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Fri, 18 Aug 2023 11:43:59 -0400
Subject: [PATCH] video: Minor cleanup in SDL_VideoQuit.
(This code changed in SDL3, no need to cherry-pick it to there.)
---
src/video/SDL_video.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index a29fd241bce5..c10ef1cf8e4a 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -3355,18 +3355,14 @@ void SDL_VideoQuit(void)
SDL_VideoDisplay *display = &_this->displays[i];
SDL_ResetDisplayModes(i);
SDL_free(display->desktop_mode.driverdata);
- display->desktop_mode.driverdata = NULL;
SDL_free(display->driverdata);
- display->driverdata = NULL;
- }
- if (_this->displays) {
- for (i = 0; i < _this->num_displays; ++i) {
- SDL_free(_this->displays[i].name);
- }
- SDL_free(_this->displays);
- _this->displays = NULL;
- _this->num_displays = 0;
+ SDL_free(display->name);
}
+
+ SDL_free(_this->displays);
+ _this->displays = NULL;
+ _this->num_displays = 0;
+
SDL_free(_this->clipboard_text);
_this->clipboard_text = NULL;
_this->free(_this);