moved the download/upload speed calculations, to be made on every invoke

of the progressupdate, as on very quick transfers they wouldn't always get
calculated!

diff --git a/lib/progress.c b/lib/progress.c
index 08d9c78..af756a0 100644 (file)
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -225,20 +225,19 @@ int Curl_pgrsUpdate(struct connectdata *conn)
   /* The exact time spent so far */
   data->progress.timespent = Curl_tvdiff (now, data->progress.start);
 
-  if(data->progress.lastshow == Curl_tvlong(now))
-    return 0; /* never update this more than once a second if the end isn't 
-                 reached */
-  data->progress.lastshow = now.tv_sec;
-
   /* The average download speed this far */
   data->progress.dlspeed = data->progress.downloaded/(data->progress.timespent!=0.0?data->progress.timespent:1.0);
 
   /* The average upload speed this far */
   data->progress.ulspeed = data->progress.uploaded/(data->progress.timespent!=0.0?data->progress.timespent:1.0);
 
+  if(data->progress.lastshow == Curl_tvlong(now))
+    return 0; /* never update this more than once a second if the end isn't 
+                 reached */
+  data->progress.lastshow = now.tv_sec;
+
   /* Let's do the "current speed" thing, which should use the fastest
          of the dl/ul speeds */
-
   data->progress.speeder[ nowindex ] =
     data->progress.downloaded>data->progress.uploaded?
     data->progress.downloaded:data->progress.uploaded;