diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2012-01-16 08:57:39 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-01-16 14:40:16 +0100 |
| commit | 30c4eaafac80cc110efa66d2dfc551386eefdf53 (patch) | |
| tree | e68f07f280fbcb820addb8529193be37dc183d54 /scripts | |
| parent | kbuild: Fix compiler warning with assertion when calling 'fwrite' (diff) | |
| download | linux-30c4eaafac80cc110efa66d2dfc551386eefdf53.tar.xz linux-30c4eaafac80cc110efa66d2dfc551386eefdf53.zip | |
menuconfig: fix a regression when canceling the prompt dialog at exit
This commit fixes a bug, while introducing a new one..
commit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2
Author: Wang YanQing <udknight@gmail.com>
Date: Thu Jan 12 11:31:32 2012 +0800
menuconfig: let make not report error when not save configuration
Pressing ESC should cancel the yes/no dialog and return back to
the main menu, but not exit from menuconfig.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Wang YanQing <udknight@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/mconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 86cd1ea35579..2c6286c0bc1a 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -830,7 +830,8 @@ static int handle_exit(void) fprintf(stderr, _("\n\n" "Your configuration changes were NOT saved." "\n\n")); - res = 0; + if (res != KEY_ESC) + res = 0; } return res; |