Merge lp:~vthompson/music-app/remix-fix-1379923 into lp:music-app/remix

[Victor Thompson]

Remove deleted item before updating currentIndex

Remove deleted item before updating currentIndex. This prevents an off-by-one error that is causing the currentIndex to not match the item in the queue.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:663
http://91.189.93.70:8080/job/music-app-remix-ci/68/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/863
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/863/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/68

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/68/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, seems to resolve the issue and not regress, hopefully we won't find any more cases :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-10 17:56:32 +0000
+++ MusicNowPlaying.qml	2014-10-10 20:07:46 +0000
@@ -448,6 +448,8 @@
 
                 leftSideAction: Remove {
                     onTriggered: {
+                        var removedIndex = index
+
                         if (queuelist.count === 1) {
                             player.stop()
                             musicToolbar.goBack()
@@ -455,12 +457,12 @@
                             player.nextSong(player.isPlaying);
                         }
 
-                        if (index < player.currentIndex) {
+                        queuelist.model.remove(index);
+
+                        if (removedIndex < player.currentIndex) {
                             // update index as the old has been removed
                             player.currentIndex -= 1;
                         }
-
-                        queuelist.model.remove(index);
                     }
                 }
                 reorderable: true