encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Detach hidden surfaces in HideWindow, not ShowWindow

This commit is contained in:
Ethan Lee 2022-01-25 11:16:09 -05:00
parent ca22b30e46
commit e2d74bcbe5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/wayland/SDL_waylandwindow.c
View File

@ -725,12 +725,6 @@ void Wayland_ShowWindow(_THIS, SDL_Window *window)
SDL_VideoData *c = _this->driverdata; SDL_VideoData *c = _this->driverdata;
SDL_WindowData *data = window->driverdata; SDL_WindowData *data = window->driverdata;
/* Detach any previous buffers before resetting everything, otherwise when
* calling this a second time you'll get an annoying protocol error
*/
wl_surface_attach(data->surface, NULL, 0, 0);
wl_surface_commit(data->surface);
/* Create the shell surface and map the toplevel */ /* Create the shell surface and map the toplevel */
#ifdef HAVE_LIBDECOR_H #ifdef HAVE_LIBDECOR_H
if (c->shell.libdecor) { if (c->shell.libdecor) {
@ -862,6 +856,10 @@ void Wayland_HideWindow(_THIS, SDL_Window *window)
wind->shell_surface.xdg.surface = NULL; wind->shell_surface.xdg.surface = NULL;
} }
} }
/* Be sure to detach after this is done, otherwise ShowWindow crashes! */
wl_surface_attach(wind->surface, NULL, 0, 0);
wl_surface_commit(wind->surface);
} }
static void static void