X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=curs_lib.c;h=e73d4f5601989c81ced4dfb09617511081994611;hb=7812231df7873c4bf46059caa84b2fa009ae787d;hp=9856b2d5d719fce7e52c81e05a37e65449a22e26;hpb=abcb4c00cbb9994087487573aa3bddd02a64ff5e;p=apps%2Fmadmutt.git

diff --git a/curs_lib.c b/curs_lib.c
index 9856b2d..e73d4f5 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -310,7 +310,7 @@ void mutt_curses_error (const char *fmt, ...)
   set_option (OPTMSGERR);
 }
 
-#ifdef USER_SOCKET
+#ifdef USE_SOCKET
 void mutt_progress_bar (progress_t* progress, long pos) {
   char posstr[SHORT_STRING];
 
@@ -318,8 +318,9 @@ void mutt_progress_bar (progress_t* progress, long pos) {
     if (!NetInc)
       mutt_message (progress->msg);
     else {
-      mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr),
-                        progress->size);
+      if (progress->size)
+        mutt_pretty_size (progress->sizestr, sizeof (progress->sizestr),
+                          progress->size);
       progress->pos = 0;
     }
   }
@@ -327,11 +328,14 @@ void mutt_progress_bar (progress_t* progress, long pos) {
   if (!NetInc)
     return;
 
-  if (pos > progress->pos + (NetInc << 10)) {
+  if (pos >= progress->pos + (NetInc << 10)) {
     progress->pos = pos;
     pos = pos / (NetInc << 10) * (NetInc << 10);
     mutt_pretty_size (posstr, sizeof (posstr), pos);
-    mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr);
+    if (progress->size)
+      mutt_message ("%s %s/%s", progress->msg, posstr, progress->sizestr);
+    else
+      mutt_message ("%s %s", progress->msg, posstr);
   }
 }
 #endif