Mercurial > emacs

diff src/xterm.c @ 56782:1dac05def6d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xterm.c (x_catch_errors_unwind): Do not XSync if display has closed.
author Jan Djärv <jan.h.d@swipnet.se>
date Tue, 24 Aug 2004 17:22:33 +0000
parents e6e0caa7ec87
children 1b899494bbe2 d58083e7ec81 d8411455de48
line wrap: on
line diff
--- a/src/xterm.c	Tue Aug 24 10:54:39 2004 +0000
+++ b/src/xterm.c	Tue Aug 24 17:22:33 2004 +0000
@@ -7604,11 +7604,13 @@
 x_catch_errors_unwind (old_val)
      Lisp_Object old_val;
 {
-  Lisp_Object first;
-
-  first = XCAR (old_val);
-
-  XSync (XSAVE_VALUE (first)->pointer, False);
+  Lisp_Object first = XCAR (old_val);
+  Display *dpy = XSAVE_VALUE (first)->pointer;
+
+  /* The display may have been closed before this function is called.
+     Check if it is still open before calling XSync.  */
+  if (x_display_info_for_display (dpy) != 0)
+    XSync (dpy, False);
 
   x_error_message_string = XCDR (old_val);
   return Qnil;