diff options
author | Peter Maydell | 2020-09-06 17:23:55 +0200 |
---|---|---|
committer | Peter Maydell | 2020-09-06 17:23:55 +0200 |
commit | 7c37270b3fbe3d034ba80e488761461676e21eb4 (patch) | |
tree | 993eecbb5ffce381937295f0abfe8a435698945b /ui/gtk-gl-area.c | |
parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20200903' into staging (diff) | |
parent | ui/gtk: Update refresh interval after widget is realized (diff) | |
download | qemu-7c37270b3fbe3d034ba80e488761461676e21eb4.tar.gz qemu-7c37270b3fbe3d034ba80e488761461676e21eb4.tar.xz qemu-7c37270b3fbe3d034ba80e488761461676e21eb4.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200904-pull-request' into staging
ui: memleak fixes.
gtk: refresh interval fix.
spice: add mouse buttons.
# gpg: Signature made Fri 04 Sep 2020 08:00:55 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20200904-pull-request:
ui/gtk: Update refresh interval after widget is realized
ui: Add more mouse buttons to SPICE
vnc-auth-sasl: Plug memleak in vnc_socket_ip_addr_string
ui/gtk-gl-area: Plug memleak in gd_gl_area_create_context()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/gtk-gl-area.c')
-rw-r--r-- | ui/gtk-gl-area.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index 85f9d14c51..98c22d23f5 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -147,10 +147,21 @@ QEMUGLContext gd_gl_area_create_context(DisplayChangeListener *dcl, gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area)); window = gtk_widget_get_window(vc->gfx.drawing_area); ctx = gdk_window_create_gl_context(window, &err); + if (err) { + g_printerr("Create gdk gl context failed: %s\n", err->message); + g_error_free(err); + return NULL; + } gdk_gl_context_set_required_version(ctx, params->major_ver, params->minor_ver); gdk_gl_context_realize(ctx, &err); + if (err) { + g_printerr("Realize gdk gl context failed: %s\n", err->message); + g_error_free(err); + g_clear_object(&ctx); + return NULL; + } return ctx; } |