Fixed bug 4013 - Wayland: fix videoquit on multimonitor system Vladimir On multimonitor system Wayland_VideoQuit invalid deiniting. Tested in Centos7 + Weston
diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c
index 759042b..5dd4863 100644
--- a/src/video/wayland/SDL_waylandvideo.c
+++ b/src/video/wayland/SDL_waylandvideo.c
@@ -233,6 +233,7 @@ display_handle_mode(void *data,
mode.w = width;
mode.h = height;
mode.refresh_rate = refresh / 1000; // mHz to Hz
+ mode.driverdata = display->driverdata;
SDL_AddDisplayMode(display, &mode);
if (flags & WL_OUTPUT_MODE_CURRENT) {
@@ -408,7 +409,7 @@ void
Wayland_VideoQuit(_THIS)
{
SDL_VideoData *data = _this->driverdata;
- int i;
+ int i, j;
Wayland_FiniMouse ();
@@ -416,6 +417,11 @@ Wayland_VideoQuit(_THIS)
SDL_VideoDisplay *display = &_this->displays[i];
wl_output_destroy(display->driverdata);
display->driverdata = NULL;
+
+ for (j = display->num_display_modes; j--;) {
+ display->display_modes[j].driverdata = NULL;
+ }
+ display->desktop_mode.driverdata = NULL;
}
Wayland_display_destroy_input(data);