aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-12-04 12:13:48 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-12-04 12:13:48 +0000
commitfb709d6483320244982e6fc8fda5425c5bcab62c (patch)
tree0b88decb3aa0b2e8fa1002b42256783a2a2a9c14
parent5984a5105fff9910b1da45f1bee35c297e67d47d (diff)
downloadsyslinux-fb709d6483320244982e6fc8fda5425c5bcab62c.tar.gz
syslinux-fb709d6483320244982e6fc8fda5425c5bcab62c.tar.xz
syslinux-fb709d6483320244982e6fc8fda5425c5bcab62c.zip
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@hotmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--com32/menu/readconfig.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
index d6f98733..dd6d5f91 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++) {