Merge lp:~gero-bare/midori/midori-bug-1187085 into lp:midori

[Gero.Bare]

Handle current_size and last_size of Download being equal

This bug was caused because current_size and last_size were equal. Now check, if that's the case restore previous speed LoL.

[Cris Dywan (kalikiana)]

Nice!

review: Approve

=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala	2014-07-11 05:49:56 +0000
+++ midori/midori-download.vala	2014-11-20 00:59:27 +0000
@@ -102,8 +102,14 @@
             string speed = "";
             uint64? last_size = download.get_data<uint64?> ("last-size");
             if (last_size != null && elapsed != last_time) {
-                speed = format_size ((uint64)(
-                    (current_size - last_size) / (elapsed - last_time)));
+                if (current_size != last_size) {
+                    speed = format_size ((uint64)(
+                        (current_size - last_size) / (elapsed - last_time)));
+                    download.set_data ("last-speed", speed.dup ());
+                }
+                else {
+                    speed = download.get_data ("last-speed");
+                }
             }
             else
                 /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */