diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:13:25 +0000 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 13:21:04 +0000 |
commit | 0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd (patch) | |
tree | 9a892c852fabd0a75d10c856105b4488cc87f66c /com32/menu | |
parent | cdeba8ac82f529a3a4a544c4e8346887ef81cb74 (diff) | |
parent | b210bd5bfd0d7182b0a65f507c7557eeb90d5b16 (diff) | |
download | syslinux-0b26e59c8f5dc7a8a124a033a78e08c7a2028bcd.tar.gz |
Merge tag 'syslinux-5.00-pre9' into for-hpa/elflink/firmware
This merge also includes the Syslinux-4.06 release.
Conflicts:
Makefile
com32/hdt/Makefile
com32/modules/Makefile
com32/samples/hello.c
mtools/Makefile
Diffstat (limited to 'com32/menu')
-rw-r--r-- | com32/menu/menumain.c | 2 | ||||
-rw-r--r-- | com32/menu/readconfig.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/com32/menu/menumain.c b/com32/menu/menumain.c index c9762b27..487f8299 100644 --- a/com32/menu/menumain.c +++ b/com32/menu/menumain.c @@ -808,7 +808,7 @@ static const char *run_menu(void) while (entry < cm->nentries && is_disabled(cm->menu_entries[entry])) entry++; } - if (entry >= cm->nentries) { + if (entry >= cm->nentries - 1) { entry = cm->nentries - 1; while (entry > 0 && is_disabled(cm->menu_entries[entry])) entry--; diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c index 69f524c4..cffe8e3d 100644 --- a/com32/menu/readconfig.c +++ b/com32/menu/readconfig.c @@ -392,7 +392,9 @@ static void record(struct menu *m, struct labeldata *ld, const char *append) break; } - if (ld->menudefault && me->action == MA_CMD) + if (ld->menudefault && (me->action == MA_CMD || + me->action == MA_GOTO || + me->action == MA_GOTO_UNRES)) m->defentry = m->nentries - 1; } |