summaryrefslogtreecommitdiff
path: root/ges
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2015-01-27 21:16:05 +0100
committerThibault Saunier <tsaunier@gnome.org>2015-01-28 11:39:58 +0100
commit0bb313030b88e4a804fa77050bee308429621731 (patch)
tree08517f94da273b33dada6ac41bc9b1354802d26f /ges
parent1efe0639dea5a5c958f8a09ab85436cbacb7eb20 (diff)
layer: Remove child from children list before emitting "child-removed"
Diffstat (limited to 'ges')
-rw-r--r--ges/ges-layer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ges/ges-layer.c b/ges/ges-layer.c
index 48f562d6..8b08eea1 100644
--- a/ges/ges-layer.c
+++ b/ges/ges-layer.c
@@ -342,6 +342,9 @@ ges_layer_remove_clip (GESLayer * layer, GESClip * clip)
}
gst_object_unref (current_layer);
+ /* Remove it from our list of controlled objects */
+ layer->priv->clips_start = g_list_remove (layer->priv->clips_start, clip);
+
/* emit 'clip-removed' */
g_signal_emit (layer, ges_layer_signals[OBJECT_REMOVED], 0, clip);
@@ -350,9 +353,6 @@ ges_layer_remove_clip (GESLayer * layer, GESClip * clip)
/* so neither in a timeline */
ges_timeline_element_set_timeline (GES_TIMELINE_ELEMENT (clip), NULL);
- /* Remove it from our list of controlled objects */
- layer->priv->clips_start = g_list_remove (layer->priv->clips_start, clip);
-
/* Remove our reference to the clip */
gst_object_unref (clip);