diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-11-14 10:50:27 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-14 10:50:27 +0000 |
| commit | 4c7278413ef068bd8239fd8a6c69d64bd2c0a385 (patch) | |
| tree | 4c39e8872de7babc24bed9fe528df28c8d82d427 /com32/menu | |
| parent | 749297b070d1fe3d82fd9e5c4306b4aaf257f2a1 (diff) | |
| parent | 348ae6af01350a9a46f3076a2facd27918f0f603 (diff) | |
| download | syslinux-4c7278413ef068bd8239fd8a6c69d64bd2c0a385.tar.gz | |
Merge tag 'syslinux-5.00-pre10' into for-hpa/elflink/firmware
Pull in the latest prerelease that includes some bug fixes for ldlinux
and a realloc() bug in core/.
Conflicts:
com32/cmenu/Makefile
com32/elflink/ldlinux/Makefile
com32/lib/Makefile
core/pxelinux.asm
Diffstat (limited to 'com32/menu')
| -rw-r--r-- | com32/menu/readconfig.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c index cffe8e3d..3690e480 100644 --- a/com32/menu/readconfig.c +++ b/com32/menu/readconfig.c @@ -189,6 +189,9 @@ static struct menu *new_menu(struct menu *parent, m->menu_master_passwd = refstr_get(parent->menu_master_passwd); m->menu_background = refstr_get(parent->menu_background); + refstr_put(m->title); + m->title = refstr_get(parent->title); + m->color_table = copy_color_table(parent->color_table); for (i = 0; i < 12; i++) { |