From 9dbc19ea174d880d5149945d832f0bcf08bfa406 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Tue, 18 Jun 2013 13:20:10 +0200 Subject: [PATCH] gdkdisplay-x11: Do not pass a NULL source device to _gdk_display_device_grab_update Pass the master device instead if the last slave is NULL. This is unlikely to happen in most of the cases, but can happen when running unit tests where there's no pointer interaction to update the last slave. https://bugzilla.gnome.org/show_bug.cgi?id=696756 --- gdk/x11/gdkdisplay-x11.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index e1a28ead40..347bcce6bd 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1737,7 +1737,8 @@ device_grab_update_callback (GdkDisplay *display, pointer_info = _gdk_display_get_pointer_info (display, device); _gdk_display_device_grab_update (display, device, - pointer_info->last_slave, serial); + pointer_info->last_slave ? pointer_info->last_slave : device, + serial); } #define XSERVER_TIME_IS_LATER(time1, time2) \