From 0024358c91e59b9d6af69e4be7f914e6721129eb Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 3 Nov 2015 23:35:32 -0500
Subject: [PATCH] scale: Fix a crash

We can only free the marks_node if there is one.
---
 gtk/gtkscale.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 97f96a6000..9cb0d365e0 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -1542,8 +1542,11 @@ gtk_scale_clear_marks (GtkScale *scale)
   gtk_style_context_remove_class (context, GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW);
   gtk_style_context_remove_class (context, GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE);
 
-  gtk_css_node_set_parent (priv->marks_node, NULL);
-  priv->marks_node = NULL;
+  if (priv->marks_node)
+    {
+      gtk_css_node_set_parent (priv->marks_node, NULL);
+      priv->marks_node = NULL;
+    }
 
   _gtk_range_set_stop_values (GTK_RANGE (scale), NULL, 0);