From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaUFG-0002qz-9Z for qemu-devel@nongnu.org; Tue, 24 Mar 2015 15:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaUFF-00086b-9p for qemu-devel@nongnu.org; Tue, 24 Mar 2015 15:12:10 -0400 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]:45210) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaUFF-00086J-3f for qemu-devel@nongnu.org; Tue, 24 Mar 2015 15:12:09 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Tue, 24 Mar 2015 20:08:48 +0100 Message-Id: <1427224128-2004-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1427224128-2004-1-git-send-email-hpoussin@reactos.org> References: <1427224128-2004-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-2.3 1/1] gtk: do not call gtk_widget_get_window if drawing area is not initialized List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann This prevents gtk_widget_get_window to return a NULL pointer. Signed-off-by: Herv=C3=A9 Poussineau --- ui/gtk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index 29bdc19..d6e01c2 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -294,6 +294,10 @@ static void gd_update_cursor(VirtualConsole *vc) return; } =20 + if (!gtk_widget_get_realized(vc->gfx.drawing_area)) { + return; + } + window =3D gtk_widget_get_window(GTK_WIDGET(vc->gfx.drawing_area)); if (s->full_screen || qemu_input_is_absolute() || s->ptr_owner =3D=3D= vc) { gdk_window_set_cursor(window, s->null_cursor); @@ -458,6 +462,10 @@ static void gd_update(DisplayChangeListener *dcl, =20 trace_gd_update(vc->label, x, y, w, h); =20 + if (!gtk_widget_get_realized(vc->gfx.drawing_area)) { + return; + } + if (vc->gfx.convert) { pixman_image_composite(PIXMAN_OP_SRC, vc->gfx.ds->image, NULL, vc->gfx.convert, @@ -540,6 +548,10 @@ static void gd_cursor_define(DisplayChangeListener *= dcl, GdkPixbuf *pixbuf; GdkCursor *cursor; =20 + if (!gtk_widget_get_realized(vc->gfx.drawing_area)) { + return; + } + pixbuf =3D gdk_pixbuf_new_from_data((guchar *)(c->data), GDK_COLORSPACE_RGB, true, 8, c->width, c->height, c->width * 4, --=20 1.7.10.4