From patchwork Tue Mar 24 19:08:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 453986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 9EC1914009B for ; Wed, 25 Mar 2015 06:12:37 +1100 (AEDT) Received: from localhost ([::1]:33988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaUFf-0003T9-P2 for incoming@patchwork.ozlabs.org; Tue, 24 Mar 2015 15:12:35 -0400 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 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id 42D314B021E; Tue, 24 Mar 2015 20:10:35 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Tue, 24 Mar 2015 20:08:48 +0100 Message-Id: <1427224128-2004-2-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.10.4 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 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:e0c:1:1599::11 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann Subject: [Qemu-devel] [PATCH for-2.3 1/1] gtk: do not call gtk_widget_get_window if drawing area is not initialized X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This prevents gtk_widget_get_window to return a NULL pointer. Signed-off-by: Hervé 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; } + if (!gtk_widget_get_realized(vc->gfx.drawing_area)) { + return; + } + window = gtk_widget_get_window(GTK_WIDGET(vc->gfx.drawing_area)); if (s->full_screen || qemu_input_is_absolute() || s->ptr_owner == vc) { gdk_window_set_cursor(window, s->null_cursor); @@ -458,6 +462,10 @@ static void gd_update(DisplayChangeListener *dcl, trace_gd_update(vc->label, x, y, w, h); + 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; + if (!gtk_widget_get_realized(vc->gfx.drawing_area)) { + return; + } + pixbuf = gdk_pixbuf_new_from_data((guchar *)(c->data), GDK_COLORSPACE_RGB, true, 8, c->width, c->height, c->width * 4,