Merge lp:~ahayzen/music-app/remix-workerscript-console-errors into lp:music-app/remix

[Andrew Hayzen]

* Fix for console errors from WorkerScript at startup

* Fix for console errors from WorkerScript at startup

You shouldn't see any more "QQuickWorkerScript: Attempt to send message before WorkerScript establishment" when the app is starting.

[Victor Thompson (vthompson)]

lgtm

[Victor Thompson (vthompson)]

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'WorkerModelLoader.qml'
--- WorkerModelLoader.qml	2014-10-28 04:03:06 +0000
+++ WorkerModelLoader.qml	2014-10-29 02:54:22 +0000
@@ -26,7 +26,7 @@
      property bool canLoad: true
      property bool completed: false
      property int i: 0
-     property var list: null
+     property var list
      property var model
      property bool preLoadComplete: false
      property int syncFactor: 5
@@ -34,11 +34,11 @@
      onCanLoadChanged: {
          /* If canLoad has been set back to true then check if there are any
            remaining items to load in the model */
-         if (canLoad && list !== null && !completed) {
+         if (canLoad && list !== undefined && !completed) {
              process();
          }
 
-         if (!canLoad) {  // sync any pending changes when canLoad changes
+         if (!canLoad && i !== 0) {  // sync any pending changes when canLoad changes
              sync()
          }
      }
@@ -50,7 +50,7 @@
 
      onMessage: {
          if (messageObject.sync === true) {
-             if (list !== null && i >= list.length) {  // if synced check if list now complete
+             if (list !== undefined && i >= list.length) {  // if synced check if list now complete
                  completed = true
              }
 
@@ -75,7 +75,7 @@
      }
 
      function clear() {
-         if (list !== null) {
+         if (list !== undefined) {
              sendMessage({'clear': true, 'model': model})
          }
      }
 
=== modified file 'music-app.qml'
--- music-app.qml	2014-10-28 19:44:58 +0000
+++ music-app.qml	2014-10-29 02:54:22 +0000
@@ -534,7 +534,6 @@
     WorkerModelLoader {
         id: queueLoaderWorker
         canLoad: false
-        list: Library.getQueue()
         model: trackQueue.model
         syncFactor: 10
 
@@ -558,6 +557,7 @@
 
         // allow the queue loader to start
         queueLoaderWorker.canLoad = !Library.isQueueEmpty()
+        queueLoaderWorker.list = Library.getQueue()
 
         // everything else
         loading.visible = true