From: Joakim Verona Date: Tue, 3 Feb 2015 00:05:15 +0000 (+0100) Subject: Guard against invalid gtk view X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=796514a9ab74da9f3931755bd8183ad732567ebc;p=emacs.git Guard against invalid gtk view --- diff --git a/src/xwidget.c b/src/xwidget.c index 747e803acc9..cf1ec3bc910 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -438,10 +438,15 @@ xwidget_slider_changed (GtkRange *range, /* when the off-screen webkit master view changes this signal is called. it copies the bitmap from the off-screen webkit instance */ gboolean -offscreen_damage_event (GtkWidget *widget, GdkEvent *event, gpointer data) +offscreen_damage_event (GtkWidget *widget, GdkEvent *event, gpointer xv_widget) { - //TODO this is wrong! should just queu a redraw of onscreen widget - gtk_widget_queue_draw (GTK_WIDGET (data)); + //queue a redraw of onscreen widget + if (GTK_IS_WIDGET (xv_widget)) + gtk_widget_queue_draw (GTK_WIDGET (xv_widget)); + else + printf("Warning, offscreen_damage_event received invalid xv pointer:%x\n",xv_widget); + + return FALSE; }