summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-01-10 13:58:39 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2015-01-10 14:25:40 +0100
commitcec5815a0de9ba60417ed6611e9addcc3e85e9a2 (patch)
tree49ca2c7ea07781c5e8db03fd4a74ce7686a6b03e
parent9fcbae2d857ed35483700be13d62a3590c719ee8 (diff)
downloadgtk+-cec5815a0de9ba60417ed6611e9addcc3e85e9a2.tar.gz
stylecontext: Stop animations on manual invalidation
If a gtk_style_context_invalidate() is called on a widget's style context (which nobody should ever do, sheesh!) and we're animating, stop the animations. Fixes crashers in Nautilus.
-rw-r--r--gtk/gtkstylecontext.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 4e91e843ee..25385f0b23 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -3072,6 +3072,9 @@ gtk_style_context_invalidate (GtkStyleContext *context)
gtk_css_node_set_values (context->priv->cssnode, style);
g_object_unref (style);
+ if (!gtk_style_context_is_saved (context))
+ _gtk_style_context_update_animating (context);
+
changes = _gtk_bitmask_new ();
changes = _gtk_bitmask_invert_range (changes,
0,