Merge lp:~ajalkane/ubuntu-filemanager-app/copy-progress-dialog-fix into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Fix for progress dialog for copying files. Previously it was possible
progress dialog was closed too early, especially when the last file
copied was a very large one.

Fix for progress dialog for copying files. Previously it was possible
progress dialog was closed too early, especially when the last file
copied was a very large one.

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

FAILED: Continuous integration, rev:63
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/34/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/335/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-precise-amd64-ci/34
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-quantal-amd64-ci/34
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/34
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/34

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/34/rebuild

review: Needs Fixing (continuous-integration)

[Michael Spencer (ibelieve)]

Thanks for the fix. Because it their were problems with Autopilot that prevented this from passing, I fixed this in the same branch that fixed the Autopilot problems.

Unmerged revisions

63. By Arto Jalkanen on 2013-09-10

Fix for progress dialog for copying files. Previously it was possible
progress dialog was closed too early, especially when the last file
copied was a very large one.

=== modified file 'FileOperationProgressDialog.qml'
--- FileOperationProgressDialog.qml	2013-06-26 23:00:41 +0000
+++ FileOperationProgressDialog.qml	2013-09-10 19:49:37 +0000
@@ -49,7 +49,7 @@
         onProgress: {
             console.log("On progress ", curItem, totalItems, percent)
             progress.value = percent
-            if (curItem == totalItems) {
+            if (percent == 100 && curItem == totalItems) {
                 console.log("All files processed, closing progress dialog")
                 PopupUtils.close(root)
             } else {