mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3908_confirm_overwrite'

Browse Source 
* 3908_confirm_overwrite:
  Ticket: 3908: quiet single file overwrite.
This commit is contained in:
Andrew Borodin 2018-04-15 11:35:56 +03:00
commit a66ee73305
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/filemanager/file.c
View File

@ -716,6 +716,9 @@ panel_operate_init_totals (const WPanel * panel, const vfs_path_t * source,
ctx->progress_totals_computed = FALSE; ctx->progress_totals_computed = FALSE;
} }
/* destroy already created UI for single file rename operation */
file_op_context_destroy_ui (ctx);
file_op_context_create_ui (ctx, TRUE, dialog_type); file_op_context_create_ui (ctx, TRUE, dialog_type);
return status; return status;
@ -1948,7 +1951,14 @@ operate_single_file (const WPanel * panel, FileOperation operation, file_op_tota
case OP_MOVE: case OP_MOVE:
if (is_file) if (is_file)
{
#ifdef ENABLE_BACKGROUND
/* create UI to show confirmation dialog */
if (!mc_global.we_are_background)
file_op_context_create_ui (ctx, TRUE, FILEGUI_DIALOG_ONE_ITEM);
#endif
value = move_file_file (panel, tctx, ctx, src, dest); value = move_file_file (panel, tctx, ctx, src, dest);
}
else else
value = do_move_dir_dir (panel, tctx, ctx, src, dest); value = do_move_dir_dir (panel, tctx, ctx, src, dest);
break; break;