From 276952d6f9c20e4a2be5fbf2ab381c263598f864 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 5 Jun 2009 16:52:18 -0400 Subject: [PATCH] Fix stopping a timeline Correctly apply De Morgan's laws to the short-circuit test in clutter_timeline_pause(); it was short-circuiting always and never actually pausing. http://bugzilla.openedhand.com/show_bug.cgi?id=1629 Signed-off-by: Emmanuele Bassi --- clutter/clutter-timeline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index d74a10786..4e8ef1672 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -709,7 +709,7 @@ clutter_timeline_pause (ClutterTimeline *timeline) priv = timeline->priv; - if (priv->delay_id == 0 || !priv->is_playing) + if (priv->delay_id == 0 && !priv->is_playing) return; if (priv->delay_id)