From: Carl Hetherington <cth@carlh.net>
Date: Thu, 23 Oct 2014 20:44:07 +0000 (+0100)
Subject: Fix Playlist::move_later.
X-Git-Tag: v2.0.48~545^2~3^2~11
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e862ba83fbcc18510c40bbf9cddf9c471003a433

Fix Playlist::move_later.
---

diff --git a/ChangeLog b/ChangeLog
index ed089ba54..ea49d8a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-23  Carl Hetherington  <cth@carlh.net>
+
+	* Fix mix-placement of content when using the "Down"
+	button to move it.
+
 2014-10-22  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.76.3 released.
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 64fdadad1..264d9ab4a 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -395,7 +395,7 @@ Playlist::move_later (shared_ptr<Content> c)
 	}
 
 	(*next)->set_position (c->position ());
-	c->set_position (c->position() + c->length_after_trim ());
+	c->set_position (c->position() + (*next)->length_after_trim ());
 	sort (_content.begin(), _content.end(), ContentSorter ());
 }