diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-03-04 16:02:41 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-03-04 16:02:41 +0000 |
| commit | 95d308680b9b69996543041c464f2a528578cc4e (patch) | |
| tree | fd3bd6c9a5dff4a07a9e09bada2fe7c2531e027f /scripts/config/mconf.c | |
| parent | f19a262b235972db5ab173d3a00f616caafe30ae (diff) | |
| download | upstream-95d308680b9b69996543041c464f2a528578cc4e.tar.gz upstream-95d308680b9b69996543041c464f2a528578cc4e.tar.bz2 upstream-95d308680b9b69996543041c464f2a528578cc4e.zip | |
disable the automatic config reset if 'Advanced configuration options' is selected
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6506 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/config/mconf.c')
| -rw-r--r-- | scripts/config/mconf.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c index 083b23efa3..74036174fc 100644 --- a/scripts/config/mconf.c +++ b/scripts/config/mconf.c @@ -888,6 +888,7 @@ static void conf_choice(struct menu *menu) const char *prompt = menu_get_prompt(menu); struct menu *child; struct symbol *active; + struct property *prop; int stat; active = sym_get_choice_value(menu->sym); @@ -920,9 +921,13 @@ static void conf_choice(struct menu *menu) case 0: if (sscanf(input_buf, "%p", &child) != 1) break; - if ((menu->sym->flags & SYMBOL_RESET) && - sym_get_tristate_value(child->sym) != yes) - conf_reset(); + + if (sym_get_tristate_value(child->sym) != yes) { + for_all_properties(menu->sym, prop, P_RESET) { + if (expr_calc_value(prop->visible.expr) != no) + conf_reset(); + } + } sym_set_tristate_value(child->sym, yes); return; case 1: |