summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@gnome.org>2016-03-11 17:29:08 +0100
committerThibault Saunier <tsaunier@gnome.org>2016-03-11 17:29:08 +0100
commit8ce2b97a936c13a48bc3ef97eb19c557e00e3a6a (patch)
tree444909367d18e9be804d84b1c950e141cdcf66bd
parentc4356db40c6e50f7314a75ea65d46f9f21ef0a5d (diff)
ges: Don't emit timeline::group-removed when ungrouping outside a timeline
-rw-r--r--ges/ges-group.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ges/ges-group.c b/ges/ges-group.c
index fa060a9d..8219cb8e 100644
--- a/ges/ges-group.c
+++ b/ges/ges-group.c
@@ -571,8 +571,10 @@ _ungroup (GESContainer * group, gboolean recursive)
g_ptr_array_add (children_array, child);
ret = g_list_append (ret, child);
}
- ges_timeline_emit_group_removed (timeline, (GESGroup *) group,
- children_array);
+
+ if (timeline)
+ ges_timeline_emit_group_removed (timeline, (GESGroup *) group,
+ children_array);
g_ptr_array_free (children_array, TRUE);
g_list_free_full (children, gst_object_unref);