diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-03-22 15:09:42 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-03-22 15:09:42 +0000 |
| commit | 610ba0e7643590cd6ccea4d3cce61a592c2df7ca (patch) | |
| tree | 1926f785df4bd77dd05f3bc3f44223c6ae87ad43 | |
| parent | 5d3af346dd8b2c46b0cfd7e6eca66232bc102bfa (diff) | |
| parent | 80ba38a0b365f65104e481f17047bf5f343b0980 (diff) | |
| download | gtk+-610ba0e7643590cd6ccea4d3cce61a592c2df7ca.tar.gz | |
Merge branch 'issue3715-gtk4' into 'master'
[gtk4] x11/dnd: Ignore XErrors from the COW
Closes #3715
See merge request GNOME/gtk!3336
| -rw-r--r-- | gdk/x11/gdkdrag-x11.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c index d8c9ac28b8..d82d3a7d4b 100644 --- a/gdk/x11/gdkdrag-x11.c +++ b/gdk/x11/gdkdrag-x11.c @@ -581,12 +581,14 @@ gdk_surface_cache_new (GdkDisplay *display) */ if (gdk_display_is_composited (display)) { + gdk_x11_display_error_trap_push (display); cow = XCompositeGetOverlayWindow (xdisplay, xroot_window); gdk_surface_cache_add (result, cow, 0, 0, WidthOfScreen (GDK_X11_SCREEN (screen)->xscreen), HeightOfScreen (GDK_X11_SCREEN (screen)->xscreen), TRUE); XCompositeReleaseOverlayWindow (xdisplay, xroot_window); + gdk_x11_display_error_trap_pop_ignored (display); } #endif |