summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-23 21:44:07 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-23 21:44:07 +0100
commite862ba83fbcc18510c40bbf9cddf9c471003a433 (patch)
treed9869d41145ee7c7270ee83030120b9d249ec05c
parent550c5d0b2b04cbf834625d1acf8d2e36600fe8db (diff)
Fix Playlist::move_later.
-rw-r--r--ChangeLog5
-rw-r--r--src/lib/playlist.cc2
2 files changed, 6 insertions, 1 deletions
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 ());
}