From d81548a28a6b8ad7d771370911b1b1f6dfdb43d6 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 9 Apr 2020 10:37:20 -0400 Subject: [PATCH] timeline: Do not compare unsigned with 0 Layer priorities are always positive the check was making no sense in any case. Fixes CID: 1444922, 1461284 --- ges/ges-timeline.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c index 3c3dddfdf7..bf0559d831 100644 --- a/ges/ges-timeline.c +++ b/ges/ges-timeline.c @@ -1253,9 +1253,10 @@ timeline_trim_object (GESTimeline * timeline, GESTimelineElement * object, } return timeline_tree_trim (timeline->priv->tree, - GES_TIMELINE_ELEMENT (object), new_layer_priority < 0 ? 0 : (gint64) + GES_TIMELINE_ELEMENT (object), (gint64) ges_timeline_element_get_layer_priority (GES_TIMELINE_ELEMENT (object)) - - new_layer_priority, edge == GES_EDGE_END ? GST_CLOCK_DIFF (position, + (gint64) new_layer_priority, + edge == GES_EDGE_END ? GST_CLOCK_DIFF (position, _START (object) + _DURATION (object)) : GST_CLOCK_DIFF (position, GES_TIMELINE_ELEMENT_START (object)), edge, timeline->priv->snapping_distance); @@ -1283,9 +1284,10 @@ timeline_move_object (GESTimeline * timeline, GESTimelineElement * object, GST_CLOCK_DIFF (position, GES_TIMELINE_ELEMENT_START (object)); ret = timeline_tree_move (timeline->priv->tree, - GES_TIMELINE_ELEMENT (object), new_layer_priority < 0 ? 0 : (gint64) + GES_TIMELINE_ELEMENT (object), (gint64) ges_timeline_element_get_layer_priority (GES_TIMELINE_ELEMENT (object)) - - new_layer_priority, offset, edge, timeline->priv->snapping_distance); + (gint64) new_layer_priority, offset, edge, + timeline->priv->snapping_distance); return ret; }