[syslinux:elflink] Revert "menu: Inherit parent menu title"

syslinux-bot for Matt Fleming matt.fleming at intel.com
Tue Dec 4 04:24:03 PST 2012


Commit-ID:  fb709d6483320244982e6fc8fda5425c5bcab62c
Gitweb:     http://www.syslinux.org/commit/fb709d6483320244982e6fc8fda5425c5bcab62c
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Tue, 4 Dec 2012 12:13:48 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 4 Dec 2012 12:13:48 +0000

Revert "menu: Inherit parent menu title"

This reverts commit 6387f043f7f870e4f0b402dae0b921d99eb82c39.

We got reports of this change causing regressions. The reverted commit
only goes half way to providing proper parent menu title inheritance,
and breaks other configs where the menu label or submenu tagname are
used for the title.

Reported-by: Ady <ady-sf at hotmail.com>
Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/menu/readconfig.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index d6f9873..dd6d5f9 100644
--- a/com32/menu/readconfig.c
+++ b/com32/menu/readconfig.c
@@ -189,9 +189,6 @@ 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