From 72519e6c5c182651d9e3a9542715f448c99d4158 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 8 Feb 2019 17:46:31 -0300 Subject: [PATCH] timeline: No error when moving an object as part of the context It will just happen from the context --- ges/ges-timeline.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c index 4e273e640f..67294610e7 100644 --- a/ges/ges-timeline.c +++ b/ges/ges-timeline.c @@ -2092,9 +2092,15 @@ ges_timeline_move_object_simple (GESTimeline * timeline, /* We only work with GESSource-s and we check that we are not already moving * the specified element ourself */ - if (GES_IS_SOURCE (element) == FALSE || - g_list_find (timeline->priv->movecontext.moving_trackelements, element)) + if (GES_IS_SOURCE (element) == FALSE) { + GST_INFO_OBJECT (element, "Not a source, not moving."); return FALSE; + } + + if (g_list_find (timeline->priv->movecontext.moving_trackelements, element)) { + GST_DEBUG_OBJECT (element, "Already part of the moving context."); + return TRUE; + } timeline->priv->needs_rollback = FALSE; track_element = GES_TRACK_ELEMENT (element);