summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-27 13:28:08 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-27 13:28:08 +0100
commitaf2dfe1cbabaa3c1fb663063a1f9778858255818 (patch)
treec9a4aa0f0db38bdbf8b0c44447ded3a9723b98c0 /src/lib
parent20fa26ea6ecfdbecea8bb1230c8388cce3fd521f (diff)
parentf357af9220d2b890a64ccd8b81bfe02b69a0450d (diff)
Merge 1.70.0-hotfix branch into master.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/playlist.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index e847e623b..df3e63303 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -362,6 +362,7 @@ Playlist::move_earlier (shared_ptr<Content> c)
if (previous == _content.end ()) {
return;
}
+
Time const p = (*previous)->position ();
(*previous)->set_position (p + c->length_after_trim ());
@@ -390,7 +391,7 @@ Playlist::move_later (shared_ptr<Content> c)
Time const p = (*next)->position ();
(*next)->set_position (c->position ());
- c->set_position (p + c->length_after_trim ());
+ c->set_position (c->position() + c->length_after_trim ());
sort (_content.begin(), _content.end(), ContentSorter ());
}