mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-03 10:04:32 +03:00
Merge branch '3908_confirm_move_dir'
* 3908_confirm_move_dir: Ticket: 3908: quiet single file overwrite.
This commit is contained in:
commit
5656ff5e84
@ -1940,15 +1940,13 @@ operate_single_file (const WPanel * panel, FileOperation operation, file_op_tota
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case OP_MOVE:
|
case OP_MOVE:
|
||||||
if (is_file)
|
|
||||||
{
|
|
||||||
#ifdef ENABLE_BACKGROUND
|
#ifdef ENABLE_BACKGROUND
|
||||||
/* create UI to show confirmation dialog */
|
/* create UI to show confirmation dialog */
|
||||||
if (!mc_global.we_are_background)
|
if (!mc_global.we_are_background)
|
||||||
file_op_context_create_ui (ctx, TRUE, FILEGUI_DIALOG_ONE_ITEM);
|
file_op_context_create_ui (ctx, TRUE, FILEGUI_DIALOG_ONE_ITEM);
|
||||||
#endif
|
#endif
|
||||||
|
if (is_file)
|
||||||
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;
|
||||||
|
Loading…
Reference in New Issue
Block a user