summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2015-09-17 16:26:23 +0100
committerPhilip Withnall <philip.withnall@collabora.co.uk>2015-09-21 17:02:39 +0100
commitae1a84853e4978092afec07aaead3e3a94f738f8 (patch)
treeb315a4221a37d541f1f64252656f9f92ae990d7e
parent8e52f8c61ef2192eaf7f2208a922d3530df47d9b (diff)
downloadclutter-ae1a84853e4978092afec07aaead3e3a94f738f8.tar.gz
timeline: Ensure waiting_first_tick is set before adding the timeline
Just in case the timeline starts being prodded by the ClutterMasterClock before the add function returns. (This has not been verified.) https://bugzilla.gnome.org/show_bug.cgi?id=755357
-rw-r--r--clutter/clutter-timeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index f64fd930f..5587cc0e1 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -990,9 +990,9 @@ set_is_playing (ClutterTimeline *timeline,
master_clock = _clutter_master_clock_get_default ();
if (priv->is_playing)
{
- _clutter_master_clock_add_timeline (master_clock, timeline);
priv->waiting_first_tick = TRUE;
priv->current_repeat = 0;
+ _clutter_master_clock_add_timeline (master_clock, timeline);
}
else
_clutter_master_clock_remove_timeline (master_clock, timeline);