mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #2858: segfault when viewing HTML files with "mc -v".

Browse Source 
(expand_format): don't try expand format and return empty line
for modes that are not used formatted variables.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-07-30 10:14:46 +04:00
parent ab05b54337
commit e2f30017a0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/filemanager/usermenu.c
View File

@ -748,8 +748,9 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote)
if (c == '%') if (c == '%')
return g_strdup ("%"); return g_strdup ("%");
if (mc_global.mc_run_mode == MC_RUN_FULL) switch (mc_global.mc_run_mode)
{ {
case MC_RUN_FULL:
if (g_ascii_islower ((gchar) c)) if (g_ascii_islower ((gchar) c))
panel = current_panel; panel = current_panel;
else else
@ -759,12 +760,19 @@ expand_format (struct WEdit *edit_widget, char c, gboolean do_quote)
panel = other_panel; panel = other_panel;
} }
fname = g_strdup (panel->dir.list[panel->selected].fname); fname = g_strdup (panel->dir.list[panel->selected].fname);
} break;
#ifdef USE_INTERNAL_EDIT #ifdef USE_INTERNAL_EDIT
else if (mc_global.mc_run_mode == MC_RUN_EDITOR) case MC_RUN_EDITOR:
fname = edit_get_file_name (edit_widget); fname = edit_get_file_name (edit_widget);
break;
#endif #endif
default:
/* other modes don't use formats */
return g_strdup ("");
}
if (do_quote) if (do_quote)
quote_func = name_quote; quote_func = name_quote;
else else