diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee index 1f8771bb..1c771fe8 100644 --- a/src/Ui/media/Wrapper.coffee +++ b/src/Ui/media/Wrapper.coffee @@ -396,7 +396,7 @@ class Wrapper updateProgress: (site_info) -> if site_info.tasks > 0 and site_info.started_task_num > 0 - @loading.setProgress 1-(site_info.tasks / site_info.started_task_num) + @loading.setProgress 1-(Math.max(site_info.tasks, site_info.bad_files) / site_info.started_task_num) else @loading.hideProgress() diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js index 9b2082e8..e0900177 100644 --- a/src/Ui/media/all.js +++ b/src/Ui/media/all.js @@ -521,6 +521,7 @@ jQuery.extend( jQuery.easing, }).call(this); + /* ---- src/Ui/media/Loading.coffee ---- */ @@ -1299,7 +1300,7 @@ jQuery.extend( jQuery.easing, Wrapper.prototype.updateProgress = function(site_info) { if (site_info.tasks > 0 && site_info.started_task_num > 0) { - return this.loading.setProgress(1 - (site_info.tasks / site_info.started_task_num)); + return this.loading.setProgress(1 - (Math.max(site_info.tasks, site_info.bad_files) / site_info.started_task_num)); } else { return this.loading.hideProgress(); } @@ -1378,4 +1379,4 @@ jQuery.extend( jQuery.easing, window.wrapper = new Wrapper(ws_url); -}).call(this); +}).call(this); \ No newline at end of file