Merge branch '3219_mcviewer_raw_parse_switch'

* 3219_mcviewer_raw_parse_switch:
  Ticket #3219: mcviewer: fix switch between raw and parse modes.
This commit is contained in:
Andrew Borodin 2014-07-08 13:29:23 +04:00
commit 4253f59d38

View File

@ -14,7 +14,7 @@
Pavel Machek, 1998
Roland Illig <roland.illig@gmx.de>, 2004, 2005
Slava Zanko <slavazanko@google.com>, 2009, 2013
Andrew Borodin <aborodin@vmail.ru>, 2009, 2013
Andrew Borodin <aborodin@vmail.ru>, 2009, 2013, 2014
Ilia Maslakov <il.smind@gmail.com>, 2009
This file is part of the Midnight Commander.
@ -75,7 +75,7 @@ const off_t OFFSETTYPE_MAX = ((off_t) 1 << (OFF_T_BITWIDTH - 1)) - 1;
void
mcview_toggle_magic_mode (mcview_t * view)
{
char *command;
char *filename, *command;
dir_list *dir;
int *dir_idx;
@ -83,6 +83,7 @@ mcview_toggle_magic_mode (mcview_t * view)
view->magic_mode = !view->magic_mode;
/* reinit view */
filename = g_strdup (vfs_path_as_str (view->filename_vpath));
command = g_strdup (view->command);
dir = view->dir;
dir_idx = view->dir_idx;
@ -90,9 +91,10 @@ mcview_toggle_magic_mode (mcview_t * view)
view->dir_idx = NULL;
mcview_done (view);
mcview_init (view);
mcview_load (view, command, vfs_path_as_str (view->filename_vpath), 0);
mcview_load (view, command, filename, 0);
view->dir = dir;
view->dir_idx = dir_idx;
g_free (filename);
g_free (command);
view->dpy_bbar_dirty = TRUE;