AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-24 20:51:10 +00:00
Code Issues Projects Releases Wiki Activity

x11: Fix a trap mixup

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2016-08-29 15:49:24 -04:00
parent ea1295c9ab
commit c9749ad7dc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/x11/gdkdevicemanager-xi2.c
View File

@ -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,