From 9627ce175cdb4df3c65b76b2205e7179883c28e5 Mon Sep 17 00:00:00 2001
From: rds <rds>
Date: Thu, 11 Jun 2009 14:19:00 +0000
Subject: [PATCH] protect against NULL background colour
---
.../items/zmapWindowContainerChildren.c | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/zmapWindow/items/zmapWindowContainerChildren.c b/src/zmapWindow/items/zmapWindowContainerChildren.c
index ecd02f00c..5af119f20 100755
--- a/src/zmapWindow/items/zmapWindowContainerChildren.c
+++ b/src/zmapWindow/items/zmapWindowContainerChildren.c
@@ -27,9 +27,9 @@
*
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
- * Last edited: Jun 2 09:41 2009 (rds)
+ * Last edited: Jun 10 16:02 2009 (rds)
* Created: Mon Apr 27 18:01:23 2009 (rds)
- * CVS info: $Id: zmapWindowContainerChildren.c,v 1.1 2009-06-02 11:20:23 rds Exp $
+ * CVS info: $Id: zmapWindowContainerChildren.c,v 1.2 2009-06-11 14:19:00 rds Exp $
*-------------------------------------------------------------------
*/
@@ -571,14 +571,15 @@ static void zmap_window_container_background_set_property(GObject
{
GdkColor *colour;
- colour = g_value_get_boxed(value);
-
- g_object_set(object, "fill-color-gdk", colour, NULL);
-
- background = ZMAP_CONTAINER_BACKGROUND(object);
-
- background->original_colour = *colour; /* struct copy */
- background->has_bg_colour = TRUE;
+ if((colour = g_value_get_boxed(value)))
+ {
+ g_object_set(object, "fill-color-gdk", colour, NULL);
+
+ background = ZMAP_CONTAINER_BACKGROUND(object);
+
+ background->original_colour = *colour; /* struct copy */
+ background->has_bg_colour = TRUE;
+ }
}
break;
case BACKGROUND_OVERRIDE_WIDTH_UNITS:
--
GitLab