mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Show Count progress bar before copy/move of 1st file,Z not after.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2010-02-14 20:09:36 +03:00 committed by Slava Zanko
parent 47abf9282f
commit 334560adac
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/file.c
View File

@ -359,14 +359,11 @@ progress_update_one (FileOpContext *ctx,
} }
/* Apply some heuristic here to not call the update stuff very often */ /* Apply some heuristic here to not call the update stuff very often */
ret = ret = file_progress_show_count (ctx, *progress_count,
file_progress_show_count (ctx, *progress_count, ctx->progress_count);
ctx->progress_count); if (ret == FILE_CONT)
if (ret != FILE_CONT) ret = file_progress_show_bytes (ctx, *progress_bytes,
return ret; ctx->progress_bytes);
ret =
file_progress_show_bytes (ctx, *progress_bytes,
ctx->progress_bytes);
return ret; return ret;
} }
@ -705,12 +702,19 @@ copy_file_file (FileOpContext *ctx, const char *src_path, const char *dst_path,
} }
file_progress_set_stalled_label (ctx, stalled_msg); file_progress_set_stalled_label (ctx, stalled_msg);
return_status = file_progress_show_bytes (ctx, *progress_bytes +
n_read_total + ctx->do_reget, ctx->progress_bytes); return_status =
if (return_status == FILE_CONT) { file_progress_show_count (ctx, *progress_count,
ctx->progress_count);
if (return_status == FILE_CONT)
return_status =
file_progress_show_bytes (ctx, *progress_bytes +
n_read_total + ctx->do_reget,
ctx->progress_bytes);
if (return_status == FILE_CONT)
return_status = return_status =
file_progress_show (ctx, n_read_total + ctx->do_reget, file_size); file_progress_show (ctx, n_read_total + ctx->do_reget, file_size);
}
mc_refresh (); mc_refresh ();
if (return_status != FILE_CONT) if (return_status != FILE_CONT)
goto ret; goto ret;