diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-12-07 16:23:22 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-07 16:23:22 -0800 |
commit | 2f74a2a8b56622951b2bad1ca19e61ad02eb9f03 (patch) | |
tree | 0208468772b4cffef6819d36b07f0b4ac9abb673 /com32/menu/menumain.c | |
parent | 2c36092660d8666a2a50c73da66717208b94eb4f (diff) | |
parent | 66a4a0bab62d10c66386c1f879a606366c5aea99 (diff) | |
download | syslinux-2f74a2a8b56622951b2bad1ca19e61ad02eb9f03.tar.gz |
Merge branch 'softres'
Diffstat (limited to 'com32/menu/menumain.c')
-rw-r--r-- | com32/menu/menumain.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c index f3f0154b..32ed1b08 100644 --- a/com32/menu/menumain.c +++ b/com32/menu/menumain.c @@ -1072,7 +1072,7 @@ static const char *run_menu(void) return cmdline; } -int menu_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { const char *cmdline; struct menu *m; @@ -1081,14 +1081,20 @@ int menu_main(int argc, char *argv[]) (void)argc; + parse_configs(argv + 1); + + /* + * We don't start the console until we have parsed the configuration + * file, since the configuration file might impact the console + * configuration, e.g. MENU RESOLUTION. + */ + start_console(); if (getscreensize(1, &rows, &cols)) { /* Unknown screen size? */ rows = 24; cols = 80; } - parse_configs(argv + 1); - /* Some postprocessing for all menus */ for (m = menu_list; m; m = m->next) { if (!m->mparm[P_WIDTH]) |