From 30c4eaafac80cc110efa66d2dfc551386eefdf53 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Mon, 16 Jan 2012 15:57:39 +0800 Subject: [PATCH] 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 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 Acked-by: Wang YanQing Signed-off-by: Michal Marek --- scripts/kconfig/mconf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- 2.20.1