From 90a7ad852809b1bf74c6f0e9ed6fc8b2cdd250ac Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Wed, 4 Nov 2009 16:52:55 +0200 Subject: [PATCH 1/2] Ticket #1790: mc crashes on start If ~/.mc/panels.ini have incorrect value of 'sort_order' key, then mc will crashed. Fix issue: Now default sort_order for incorrect value is 'name' (sort by name) Signed-off-by: Slava Zanko --- src/setup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/setup.c b/src/setup.c index 92f1ae8b0..3e633157c 100644 --- a/src/setup.c +++ b/src/setup.c @@ -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 */ From 7bdff350625d9d796add2a10ec07af7a56e5a05c Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Wed, 4 Nov 2009 16:55:24 +0200 Subject: [PATCH 2/2] Makefile.am: Fixed incorrect variable name if maintainer mode is active. Signed-off-by: Slava Zanko --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1ff9d1767..28cdbd267 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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