From c9749ad7dca87628caeeb87ac967d95871643698 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Aug 2016 15:49:24 -0400 Subject: x11: Fix a trap mixup There was a return between a push/pop of an error trap, and this managed to trigger the 'unpopped trap' warning in the displayclose test now. Fix this. --- gdk/x11/gdkdevicemanager-xi2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gdk') diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index 2fd413c082..078a839bcf 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -353,7 +353,10 @@ get_device_ids (GdkDisplay *display, prop = XInternAtom (GDK_DISPLAY_XDISPLAY (display), "Device Product ID", True); if (prop == None) - return 0; + { + gdk_x11_display_error_trap_pop_ignored (display); + return 0; + } rc = XIGetProperty (GDK_DISPLAY_XDISPLAY (display), info->deviceid, prop, -- cgit v1.2.1