From 7a699e79f6e2616dbbc3acc2024f97c90caa485c Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sun, 20 Feb 2022 09:14:00 +0800 Subject: [PATCH] Free XI2 devices in x_delete_display instead * src/xterm.c (x_delete_display): Free XI2 device data here instead, since it doesn't involve contacting the X server any more. (x_delete_terminal): Stop freeing XI2 device data. --- src/xterm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index e2ad0b48f58..64bee110227 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -16584,6 +16584,11 @@ x_delete_display (struct x_display_info *dpyinfo) xfree (dpyinfo->x_dnd_atoms); xfree (dpyinfo->color_cells); xfree (dpyinfo); + +#ifdef HAVE_XINPUT2 + if (dpyinfo->supports_xi2) + x_free_xi_devices (dpyinfo); +#endif } #ifdef USE_X_TOOLKIT @@ -16729,10 +16734,6 @@ x_delete_terminal (struct terminal *terminal) if (dpyinfo->xkb_desc) XkbFreeKeyboard (dpyinfo->xkb_desc, XkbAllComponentsMask, True); #endif -#ifdef HAVE_XINPUT2 - if (dpyinfo->supports_xi2) - x_free_xi_devices (dpyinfo); -#endif #ifdef USE_GTK xg_display_close (dpyinfo->display); #else -- 2.39.5