Merge branch '3131_copy_move_tilde_expand'

* 3131_copy_move_tilde_expand:
  Ticket #3131: incorrect tilde expandion in copy/rename/move dialog.
This commit is contained in:
Andrew Borodin 2014-02-05 12:38:09 +04:00
commit b7209c0c76

View File

@ -1312,6 +1312,9 @@ file_mask_dialog (file_op_context_t * ctx, FileOperation operation,
else
ctx->search_handle->search_type = MC_SEARCH_T_REGEX;
tmp = dest_dir;
dest_dir = tilde_expand (tmp);
g_free (tmp);
vpath = vfs_path_from_str (dest_dir);
ctx->dest_mask = strrchr (dest_dir, PATH_SEP);