dvd-sector-copy.c: Go back to showing just disc progress when continuing.

diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c
index e60bbbe3b5257cfe202136a34105f3f6c2b61d32..0f2ddb77a06c164fc20922709c5a9b694500b402 100644 (file)
--- a/dvd-sector-copy.c
+++ b/dvd-sector-copy.c
@@ -1227,7 +1227,9 @@ int main(int argc, char *argv[])
 
   copy_progress.render = render_copy_progress;
   progress_additem(&progress, &copy_progress);
 
   copy_progress.render = render_copy_progress;
   progress_additem(&progress, &copy_progress);

-  if (nsectors != limit) {
+  if (nsectors == limit - start)
+    { ndone = start; nsectors = limit; }
+  else {

     disc_progress.render = render_disc_progress;
     progress_additem(&progress, &disc_progress);
   }
     disc_progress.render = render_disc_progress;
     progress_additem(&progress, &disc_progress);
   }


@@ -1296,6 +1298,7 @@ int main(int argc, char *argv[])
 
   if (f&f_stats) {
     gettimeofday(&tv1, 0); t = tvdiff(&tv0, &tv1);
 
   if (f&f_stats) {
     gettimeofday(&tv1, 0); t = tvdiff(&tv0, &tv1);

+    if (nsectors == limit - start) { ndone -= start; nsectors -= start; }

     tot = scale_bytes((double)nsectors*SECTORSZ, &totunit);
     rate = scale_bytes((double)nsectors*SECTORSZ/t, &rateunit);
     moan("all done: %.1f %sB in %s -- %.1f %sB/s",
     tot = scale_bytes((double)nsectors*SECTORSZ, &totunit);
     rate = scale_bytes((double)nsectors*SECTORSZ/t, &rateunit);
     moan("all done: %.1f %sB in %s -- %.1f %sB/s",