Merge lp:~ahayzen/music-app/fix-1412211-stop-queueworker-content-hub-import into lp:music-app/remix

Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 791
Merged at revision: 792
Proposed branch: lp:~ahayzen/music-app/fix-1412211-stop-queueworker-content-hub-import
Merge into: lp:music-app/remix
Diff against target: 13 lines (+3/-0)
1 file modified
music-app.qml (+3/-0)
To merge this branch: bzr merge lp:~ahayzen/music-app/fix-1412211-stop-queueworker-content-hub-import
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Review via email: mp+246848@code.launchpad.net

Commit message

* Stop queueLoaderWorker when content-hub is importing

Description of the change

* Stop queueLoaderWorker when content-hub is importing

To post a comment you must log in.
Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM! Nice simple fix.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'music-app.qml'
2--- music-app.qml 2015-01-18 00:27:19 +0000
3+++ music-app.qml 2015-01-18 17:42:04 +0000
4@@ -299,6 +299,9 @@
5 contentHubWaitForFile.searchPaths = contentHub.searchPaths;
6 contentHubWaitForFile.processId = processId;
7 contentHubWaitForFile.start();
8+
9+ // Stop queue loading in bg
10+ queueLoaderWorker.canLoad = false
11 } else {
12 contentHubWaitForFile.searchPaths.push.apply(contentHubWaitForFile.searchPaths, contentHub.searchPaths);
13 contentHubWaitForFile.count = 0;

Subscribers

People subscribed via source and target branches