From 148e7ef411c4422eaac1744ca9858dc3699ad399 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 30 Jan 2012 17:47:42 +0100 Subject: [PATCH] timelineobject: Set TrackObject's TimelineObject only when calling the add function ges_timeline_object_add_track_object actually calls ges_track_object_set_timeline_object so do not do it once more ourself. Especially since it results in having a TrackObject.timeline_object refering to a TimelineObject it is not actually in yet. --- ges/ges-timeline-object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ges/ges-timeline-object.c b/ges/ges-timeline-object.c index 874974ac57..eb3b74911d 100644 --- a/ges/ges-timeline-object.c +++ b/ges/ges-timeline-object.c @@ -470,9 +470,10 @@ ges_timeline_object_create_track_objects_func (GESTimelineObject * object, GST_DEBUG ("Did not create track object"); return FALSE; } - ges_track_object_set_timeline_object (result, object); + ret = ges_track_add_object (track, result); ges_timeline_object_add_track_object (object, result); + return ret; }