diff options
Diffstat (limited to 'gdk/x11/gdkdisplay-x11.c')
| -rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 6804ed2006..de91c642e9 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -2878,10 +2878,14 @@ gdk_x11_display_get_default_seat (GdkDisplay *display) { GList *seats, *l; int device_id; + gboolean result = FALSE; seats = gdk_display_list_seats (display); - XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display), - None, &device_id); + + gdk_x11_display_error_trap_push (display); + result = XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display), + None, &device_id); + gdk_x11_display_error_trap_pop_ignored (display); for (l = seats; l; l = l->next) { @@ -2889,7 +2893,7 @@ gdk_x11_display_get_default_seat (GdkDisplay *display) pointer = gdk_seat_get_pointer (l->data); - if (gdk_x11_device_get_id (pointer) == device_id) + if (gdk_x11_device_get_id (pointer) == device_id || !result) { GdkSeat *seat = l->data; g_list_free (seats); |