geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X11: Remove our X11 error callback in X11_DeleteDevice() 

If we don't remove it, we will infinitely recurse if X11_CreateDevice() is
called again and orig_x11_errhandler becomes X11_SafetyNetErrHandler().
Cameron Gutman 2020-09-07 20:10:50 -07:00
parent 9c342e76dd
commit 9a769da04a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/x11/SDL_x11video.c
View File

@ -92,6 +92,8 @@ get_classname()
/* X11 driver bootstrap functions */ /* X11 driver bootstrap functions */
static int (*orig_x11_errhandler) (Display *, XErrorEvent *) = NULL;
static void static void
X11_DeleteDevice(SDL_VideoDevice * device) X11_DeleteDevice(SDL_VideoDevice * device)
{ {
@ -100,6 +102,7 @@ X11_DeleteDevice(SDL_VideoDevice * device)
device->Vulkan_UnloadLibrary(device); device->Vulkan_UnloadLibrary(device);
} }
if (data->display) { if (data->display) {
X11_XSetErrorHandler(orig_x11_errhandler);
X11_XCloseDisplay(data->display); X11_XCloseDisplay(data->display);
} }
SDL_free(data->windowlist); SDL_free(data->windowlist);
@ -111,7 +114,6 @@ X11_DeleteDevice(SDL_VideoDevice * device)
/* An error handler to reset the vidmode and then call the default handler. */ /* An error handler to reset the vidmode and then call the default handler. */
static SDL_bool safety_net_triggered = SDL_FALSE; static SDL_bool safety_net_triggered = SDL_FALSE;
static int (*orig_x11_errhandler) (Display *, XErrorEvent *) = NULL;
static int static int
X11_SafetyNetErrHandler(Display * d, XErrorEvent * e) X11_SafetyNetErrHandler(Display * d, XErrorEvent * e)
{ {