summaryrefslogtreecommitdiff
path: root/scripts/config
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-29 11:19:50 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-29 11:19:50 +0000
commit15aefc67e4ad085c8ff5c6c79a2dd22b15e9b2f3 (patch)
treede81fccd25f21f2156d7f805cce093ba779601be /scripts/config
parent73a7251b02a3df8fb471981cf37da25bab3d6648 (diff)
fix menuconfig 'deselect' statement
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6753 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/config')
-rw-r--r--scripts/config/symbol.c11
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))