1 files changed, 10 insertions, 2 deletions

diff --git a/src/xselect.c b/src/xselect.c
index 120a5a163e2..121b17df1b0 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -794,8 +794,16 @@ x_cancel_selection_transfer (struct transfer *transfer)
                                     transfer->requestor)
       /* This can be called from x_delete_display.  */
       && transfer->dpyinfo->display)
-    XSelectInput (transfer->dpyinfo->display,
-                  transfer->requestor, NoEventMask);
+    {
+      /* Ignore errors generated by the change window request in case
+         the window has gone away.  */
+      block_input ();
+      x_ignore_errors_for_next_request (transfer->dpyinfo);
+      XSelectInput (transfer->dpyinfo->display,
+                    transfer->requestor, NoEventMask);
+      x_stop_ignoring_errors (transfer->dpyinfo);
+      unblock_input ();
+    }
 
   cancel_atimer (transfer->timeout);
   xfree (transfer);