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

Merge branch '2125_ask_overwrite_twice'

Browse Source 
* 2125_ask_overwrite_twice:
  Ticket #2125 (User asked twice about overwriting file)
This commit is contained in:
Martin Petricek 2010-04-02 00:35:46 +02:00
commit 13e3c684bd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/file.c
View File

@ -1054,6 +1054,7 @@ move_file_file (FileOpTotalContext *tctx, FileOpContext *ctx, const char *s, con
struct stat src_stats, dst_stats; struct stat src_stats, dst_stats;
FileProgressStatus return_status = FILE_CONT; FileProgressStatus return_status = FILE_CONT;
gboolean copy_done = FALSE; gboolean copy_done = FALSE;
gboolean old_ask_overwrite;
file_progress_show_source (ctx, s); file_progress_show_source (ctx, s);
file_progress_show_target (ctx, d); file_progress_show_target (ctx, d);
@ -1121,7 +1122,10 @@ move_file_file (FileOpTotalContext *tctx, FileOpContext *ctx, const char *s, con
#endif #endif
/* Failed because filesystem boundary -> copy the file instead */ /* Failed because filesystem boundary -> copy the file instead */
old_ask_overwrite = tctx->ask_overwrite;
tctx->ask_overwrite = FALSE;
return_status = copy_file_file (tctx, ctx, s, d); return_status = copy_file_file (tctx, ctx, s, d);
tctx->ask_overwrite = old_ask_overwrite;
if (return_status != FILE_CONT) if (return_status != FILE_CONT)
return return_status; return return_status;