diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:01:44 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:01:44 +0100 |
commit | 126d16b0f81f5fae2de5469d9f233d9b79d08d61 (patch) | |
tree | b0c628ae22f06a19b5620a2a8b8a8da03ec2da95 /src/multimedia | |
parent | c5f34e063927ed10206f9f378092f6fd3f71af3c (diff) | |
parent | fa66653d99052f6fce74824ab12e0148922e27bc (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ic9ca37f9f5d047cb3addeece5bab7b71ae78ce19
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/playback/qmediaplaylistprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp index b146fb7b3..8089a9320 100644 --- a/src/multimedia/playback/qmediaplaylistprovider.cpp +++ b/src/multimedia/playback/qmediaplaylistprovider.cpp @@ -246,7 +246,7 @@ bool QMediaPlaylistProvider::removeMedia(int position) */ bool QMediaPlaylistProvider::removeMedia(int start, int end) { - for (int pos=start; pos<=end; pos++) { + for (int pos=end; pos>=start; pos--) { if (!removeMedia(pos)) return false; } |