Merge branch '1790_mc_crash'

* 1790_mc_crash:
  Makefile.am: Fixed incorrect variable name if maintainer mode is active.
  Ticket #1790: mc crashes on start
This commit is contained in:
Slava Zanko 2009-11-11 11:33:41 +02:00
commit 398138f6dc
2 changed files with 4 additions and 1 deletions

View File

@ -44,7 +44,7 @@ SRC_maintainer=logging.c logging.h
SRC_charset = charsets.c charsets.h selcodepage.c selcodepage.h
if USE_MAINTAINER_MODE
SRC_USE_maintainer=$(SRC_MAINTAINER)
SRC_USE_maintainer=$(SRC_maintainer)
endif
if CHARSET

View File

@ -410,6 +410,9 @@ panel_load_setup (WPanel *panel, const char *section)
/* Load sort order */
buffer = mc_config_get_string(mc_panels_config, section, "sort_order", "name");
panel->current_sort_field = panel_get_field_by_id(buffer);
if (panel->current_sort_field == NULL )
panel->current_sort_field = panel_get_field_by_id("name");
g_free(buffer);
/* Load the listing mode */