mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2448_copy_progress_crash' 

* 2448_copy_progress_crash:
  fix crash in progress bar handling
  Ticket #2448: division by zero in file copy progress dialog.
This commit is contained in:
Andrew Borodin 2010-12-23 14:26:05 +03:00
parent 31d440ca6e b51ae367da
commit a557605cac
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/filemanager/file.c
View File

@ -528,14 +528,15 @@ copy_file_file_display_progress (FileOpTotalContext * tctx, FileOpContext * ctx,
if (total_secs < 1)
total_secs = 1;
tctx->bps = tctx->copyed_bytes / total_secs;
tctx->eta_secs = remain_bytes / tctx->bps;
tctx->eta_secs = (tctx->bps != 0) ? remain_bytes / tctx->bps : 0;
}
#else
/* broken on lot of little files */
tctx->bps_count++;
tctx->bps = (tctx->bps * (tctx->bps_count - 1) + ctx->bps) / tctx->bps_count;
tctx->eta_secs = remain_bytes / tctx->bps;
tctx->eta_secs = (tctx->bps != 0) ? remain_bytes / tctx->bps : 0;
#endif
}
}
@ -860,7 +861,7 @@ panel_get_file (WPanel * panel, struct stat *stat_buf)
static FileProgressStatus
panel_compute_totals (const WPanel * panel, const void *ui,
compute_dir_size_callback cback,
size_t * ret_marked, uintmax_t *ret_total, gboolean compute_symlinks)
size_t * ret_marked, uintmax_t * ret_total, gboolean compute_symlinks)
{
int i;
@ -2123,7 +2124,7 @@ compute_dir_size_update_ui (const void *ui, const char *dirname)
FileProgressStatus
compute_dir_size (const char *dirname, const void *ui,
compute_dir_size_callback cback,
size_t * ret_marked, uintmax_t *ret_total, gboolean compute_symlinks)
size_t * ret_marked, uintmax_t * ret_total, gboolean compute_symlinks)
{
int res;
struct stat s;

2
src/filemanager/filegui.c
View File

@ -617,7 +617,7 @@ file_op_context_create_ui_without_init (FileOpContext * ctx, gboolean with_eta,
if ((right_panel == current_panel) && !classic_progressbar)
{
ui->progress_file_gauge->from_left_to_right = FALSE;
if (dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
if (verbose && dialog_type == FILEGUI_DIALOG_MULTI_ITEM)
ui->progress_total_gauge->from_left_to_right = FALSE;
}
}