ubuntu-touch-coreapps-reviewers team mailing list archive

[Andrew Hayzen <ahayzen@xxxxxxxxx>]

Andrew Hayzen has proposed merging lp:~ahayzen/music-app/refactor-improve-current-file-restore-2 into lp:music-app/refactor.

Commit message:
* Only autoset the source due to queue count changes when the queue worker has completed

Requested reviews:
  Music App Developers (music-app-dev)

For more details, see:
https://code.launchpad.net/~ahayzen/music-app/refactor-improve-current-file-restore-2/+merge/257711

* Only autoset the source due to queue count changes when the queue worker has completed
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~ahayzen/music-app/refactor-improve-current-file-restore-2 into lp:music-app/refactor.

=== modified file 'app/components/Player.qml'
--- app/components/Player.qml	2015-04-28 17:11:28 +0000
+++ app/components/Player.qml	2015-04-29 00:48:07 +0000
@@ -60,10 +60,10 @@
     Connections {
         target: trackQueue.model
         onCountChanged: {
-            if (trackQueue.model.count === 1) {
+            if (trackQueue.model.count === 1 && queueLoaderWorker.completed) {
                 player.currentIndex = 0;
                 setSource(Qt.resolvedUrl(trackQueue.model.get(0).filename))
-            } else if (trackQueue.model.count === 0) {
+            } else if (trackQueue.model.count === 0 && queueLoaderWorker.completed) {
                 player.currentIndex = -1
                 setSource("")
             }