diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2016-08-29 15:49:24 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-08-29 15:51:05 -0400 |
| commit | c9749ad7dca87628caeeb87ac967d95871643698 (patch) | |
| tree | 9ec9619a2b750e1f805f89d34ebd34c6295eaa3f /gdk | |
| parent | ea1295c9ab40ab8c1b5b80ccf1575710c5ff6b86 (diff) | |
| download | gtk+-c9749ad7dca87628caeeb87ac967d95871643698.tar.gz | |
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.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/x11/gdkdevicemanager-xi2.c | 5 |
1 files changed, 4 insertions, 1 deletions
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, |