diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-03 12:03:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-03 12:03:36 +0100 |
| commit | 6b3532b20b787cbd697a68b383232f5c3b39bd1e (patch) | |
| tree | 528ad89177395432a92c08840508bbd5025bb06f /ui/gtk.c | |
| parent | defbaec16007bdf26e44c5add27e686f74dc94e5 (diff) | |
| parent | c5ce83334465ee5acb6789a2f22d125273761c9e (diff) | |
| download | focaccia-qemu-6b3532b20b787cbd697a68b383232f5c3b39bd1e.tar.gz focaccia-qemu-6b3532b20b787cbd697a68b383232f5c3b39bd1e.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160603-1' into staging
vnc: keyboard delay, colormap support ui: misc bugfixes # gpg: Signature made Fri 03 Jun 2016 08:02:32 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-ui-20160603-1: vnc: add configurable keyboard delay sdl2: skip init without outputs vnc: Add support for color map SDL2: add bgrx pixel format gtk: fix unchecked vc dereference ui: spice: Exit if gl=on EGL init fails ui: egl: Replace fprintf with error_report Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/gtk.c')
| -rw-r--r-- | ui/gtk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk.c b/ui/gtk.c index 7572cec8c5..01b821616e 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1477,13 +1477,14 @@ static void gd_grab_pointer(VirtualConsole *vc, const char *reason) static void gd_ungrab_pointer(GtkDisplayState *s) { VirtualConsole *vc = s->ptr_owner; - GdkDisplay *display = gtk_widget_get_display(vc->gfx.drawing_area); + GdkDisplay *display; if (vc == NULL) { return; } s->ptr_owner = NULL; + display = gtk_widget_get_display(vc->gfx.drawing_area); #if GTK_CHECK_VERSION(3, 20, 0) gd_grab_update(vc, vc->s->kbd_owner == vc, false); gdk_device_warp(gd_get_pointer(display), |