summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]apps/files/js/file-upload.js13
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index c7e2329eabc..bfb88bc5d20 100755..100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1006,14 +1006,15 @@ OC.Uploader.prototype = _.extend({
bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds;
buffer[bufferIndex] = remainingSeconds; //buffer to make it smoother
bufferIndex = (bufferIndex + 1) % bufferSize;
- bufferIndex2 = bufferIndex2++;
+ bufferIndex2++;
}
var smoothRemainingSeconds;
- if(bufferIndex2<20) {
- smoothRemainingSeconds = bufferTotal / bufferIndex2;
- }
- else {
- smoothRemainingSeconds = bufferTotal / bufferSize;
+ if (bufferIndex2 > 0 && bufferIndex2 < 20) {
+ smoothRemainingSeconds = bufferTotal / bufferIndex2;
+ } else if (bufferSize > 0) {
+ smoothRemainingSeconds = bufferTotal / bufferSize;
+ } else {
+ smoothRemainingSeconds = 1;
}
var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();