(x_delete_display): Move xim_close_dpy call to x_delete_terminal.

(x_delete_terminal): Call xim_close_dpy.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/xterm.c b/src/xterm.c
index ffc03bc10e9..c47bd5026f7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10524,10 +10524,6 @@ x_delete_display (dpyinfo)
   XrmDestroyDatabase (dpyinfo->xrdb);
 #endif
 #endif
-#ifdef HAVE_X_I18N
-  if (dpyinfo->xim)
-    xim_close_dpy (dpyinfo);
-#endif
 
   xfree (dpyinfo->x_id_name);
   xfree (dpyinfo->x_dnd_atoms);
@@ -10635,6 +10631,13 @@ x_delete_terminal (struct terminal *terminal)
     return;
 
   BLOCK_INPUT;
+#ifdef HAVE_X_I18N
+  /* We must close our connection to the XIM server before closing the
+     X display.  */
+  if (dpyinfo->xim)
+    xim_close_dpy (dpyinfo);
+#endif
+
   /* If called from x_connection_closed, the display may already be closed
      and dpyinfo->display was set to 0 to indicate that.  */
   if (dpyinfo->display)