[Pcb-src-changes] pcb.git: branch: master updated (a369bf7cf2cfffbf9c44fc5ef3be8b0f9beabc0e)

[<gi...@gp...>]

The branch, master has been updated
       via  a369bf7cf2cfffbf9c44fc5ef3be8b0f9beabc0e (commit)
      from  cbd2f49e3b4f48c45e70b76ce207e9e76a81dcb8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/hid/gtk/gtkhid-gdk.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


=================
 Commit Messages
=================

commit a369bf7cf2cfffbf9c44fc5ef3be8b0f9beabc0e
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    hid/gtk: Avoid warning caused by early drawing before gport->pixmap is set
    
    Avoids a command line warning:
    
    (pcb:28876): Gdk-CRITICAL **: IA__gdk_draw_drawable: assertion `GDK_IS_DRAWABLE (src)' failed
    
    With the GDK renderer in use.
    
    This trigger appears to be some state changes triggered as the new layer
    selector widget initialises.

:100644 100644 4deae2b... ef3b30c... M	src/hid/gtk/gtkhid-gdk.c

=========
 Changes
=========

commit a369bf7cf2cfffbf9c44fc5ef3be8b0f9beabc0e
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>

    hid/gtk: Avoid warning caused by early drawing before gport->pixmap is set
    
    Avoids a command line warning:
    
    (pcb:28876): Gdk-CRITICAL **: IA__gdk_draw_drawable: assertion `GDK_IS_DRAWABLE (src)' failed
    
    With the GDK renderer in use.
    
    This trigger appears to be some state changes triggered as the new layer
    selector widget initialises.

diff --git a/src/hid/gtk/gtkhid-gdk.c b/src/hid/gtk/gtkhid-gdk.c
index 4deae2b..ef3b30c 100644
--- a/src/hid/gtk/gtkhid-gdk.c
+++ b/src/hid/gtk/gtkhid-gdk.c
@@ -1135,8 +1135,11 @@ ghid_screen_update (void)
 {
   render_priv *priv = gport->render_priv;
 
+  if (gport->pixmap == NULL)
+    return;
+
   gdk_draw_drawable (gport->drawing_area->window, priv->bg_gc, gport->pixmap,
-		     0, 0, 0, 0, gport->width, gport->height);
+                     0, 0, 0, 0, gport->width, gport->height);
   show_crosshair (TRUE);
 }