diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-03-29 11:19:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-29 11:19:50 +0000 |
| commit | a65202bf3faad6a64795dc86d3f65675048433d8 (patch) | |
| tree | de81fccd25f21f2156d7f805cce093ba779601be | |
| parent | 70efcfa4b504313e655d57e8b437afa2a17f103c (diff) | |
| download | upstream-a65202bf3faad6a64795dc86d3f65675048433d8.tar.gz upstream-a65202bf3faad6a64795dc86d3f65675048433d8.tar.bz2 upstream-a65202bf3faad6a64795dc86d3f65675048433d8.zip | |
fix menuconfig 'deselect' statement
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6753 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | scripts/config/symbol.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c index 23246ca3d4..2c1392ad43 100644 --- a/scripts/config/symbol.c +++ b/scripts/config/symbol.c @@ -197,6 +197,7 @@ static void sym_calc_visibility(struct symbol *sym) { struct property *prop; tristate tri; + int deselected = 0; /* any prompt visible? */ tri = no; @@ -206,15 +207,15 @@ static void sym_calc_visibility(struct symbol *sym) } if (tri == mod && (sym->type != S_TRISTATE)) tri = yes; - if (sym->rev_dep_inv.expr) { - if (expr_calc_value(sym->rev_dep_inv.expr) == yes) - tri = no; + if (sym->rev_dep_inv.expr && (expr_calc_value(sym->rev_dep_inv.expr) == yes)) { + tri = no; + deselected = 1; } if (sym->visible != tri) { sym->visible = tri; sym_set_changed(sym); } - if (sym_is_choice_value(sym)) + if (sym_is_choice_value(sym) || deselected) return; tri = no; if (sym->rev_dep.expr) @@ -310,6 +311,8 @@ void sym_calc_value(struct symbol *sym) if (sym_is_choice_value(sym) && sym->visible == yes) { prop = sym_get_choice_prop(sym); newval.tri = (prop_get_symbol(prop)->curr.val == sym) ? yes : no; + } else if (sym->rev_dep_inv.expr && (expr_calc_value(sym->rev_dep_inv.expr) == yes)) { + newval.tri = no; } else if (E_OR(sym->visible, sym->rev_dep.tri) != no) { sym->flags |= SYMBOL_WRITE; if (sym_has_value(sym)) |