Ticket #3035: prepare to 4.8.10 release.

(move_dir_dir): fix segfault during file erase after directory move.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-07-25 14:34:45 +04:00
parent 1f4147e03e
commit 0fe4734fd6

View File

@ -2378,7 +2378,14 @@ move_dir_dir (FileOpTotalContext * tctx, FileOpContext * ctx, const char *s, con
mc_refresh (); mc_refresh ();
if (ctx->erase_at_end) if (ctx->erase_at_end)
{ {
for (; erase_list != NULL && return_status != FILE_ABORT;) /* remove files after move */
if (erase_list != NULL)
{
file_op_context_destroy_ui (ctx);
file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM);
}
while (erase_list != NULL && return_status != FILE_ABORT)
{ {
struct link *lp = (struct link *) erase_list->data; struct link *lp = (struct link *) erase_list->data;