summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-08-03 03:30:59 +0000
committerMatthias Clasen <mclasen@redhat.com>2020-08-03 03:30:59 +0000
commit9659d3f78a61a8a7a628e9809ff4524df92ac289 (patch)
tree6334f19c1be04566f3422192030e9af52237ca65 /gdk
parentc211fdcf426a5d820a75998d81b4fd4d305c879d (diff)
parent4152e90e7e94d5eccc6feac1ea500d73d9d28db8 (diff)
downloadgtk+-9659d3f78a61a8a7a628e9809ff4524df92ac289.tar.gz
Merge branch 'applaunch-warning' into 'master'
x11: Ignore stray DestroyNotify events Closes #3006 See merge request GNOME/gtk!2355
Diffstat (limited to 'gdk')
-rw-r--r--gdk/x11/gdkdisplay-x11.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index e895a07867..a2bcefa67d 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -795,7 +795,8 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
if (!is_substructure)
{
- event = gdk_delete_event_new (surface);
+ if (surface)
+ event = gdk_delete_event_new (surface);
if (surface && GDK_SURFACE_XID (surface) != x11_screen->xroot_window)
gdk_surface_destroy_notify (surface);