[syslinux:elflink] menu: Inherit parent menu title

syslinux-bot for Matt Fleming matt.fleming at intel.com
Tue Nov 13 11:06:10 PST 2012


Commit-ID:  6387f043f7f870e4f0b402dae0b921d99eb82c39
Gitweb:     http://www.syslinux.org/commit/6387f043f7f870e4f0b402dae0b921d99eb82c39
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Thu, 25 Oct 2012 11:35:14 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Mon, 12 Nov 2012 15:06:27 +0000

menu: Inherit parent menu title

The documentation for the menu system clearly states that all
properties of the parent are inherited in the submenu. Unfortunately
there's a bug that means this isn't true for the parent's menu title,
so fix that.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 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 cffe8e3..3690e48 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++) {


More information about the Syslinux-commits mailing list