Merge branch '3034_zip_in_tar'

* 3034_zip_in_tar:
  Ticket #3034: cannot enter into zip archive in tar one.
This commit is contained in:
Andrew Borodin 2013-07-12 14:11:34 +04:00
commit 675ee47aa6

View File

@ -679,10 +679,10 @@ regex_check_type (const vfs_path_t * filename_vpath, const char *ptr, int *have_
}
#endif /* HAVE_CHARSET */
mc_ungetlocalcopy (filename_vpath, localfile_vpath, FALSE);
got_data = get_file_type_local (localfile_vpath, content_string, sizeof (content_string));
mc_ungetlocalcopy (filename_vpath, localfile_vpath, FALSE);
if (got_data > 0)
{
char *pp;