aboutsummaryrefslogtreecommitdiffstats
path: root/com32/menu
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-24 14:41:00 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-24 14:41:00 +0100
commita7115d314dda45324baccee6898a561ed253c8e1 (patch)
tree02db40f456aa512205e06480611da3569692afef /com32/menu
parentc5d8c3f1676afb21cc9f780b6161eaaab35730fc (diff)
parent7307d60063ee4303da4de45f9d984fdc8df92146 (diff)
downloadsyslinux-a7115d314dda45324baccee6898a561ed253c8e1.tar.gz
syslinux-a7115d314dda45324baccee6898a561ed253c8e1.tar.xz
syslinux-a7115d314dda45324baccee6898a561ed253c8e1.zip
Merge branch 'master' into elflink
The following conflict is a result of the fact comapi_chainboot was only stubbed out on the 'elflink' branch but was properly marked as obsolete in 'master'. Conflicts: core/comboot.inc
Diffstat (limited to 'com32/menu')
-rw-r--r--com32/menu/menumain.c2
-rw-r--r--com32/menu/readconfig.c4
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;
}