menuconfig: fix a regression when canceling the prompt dialog at exit

30c4eaaf · Li Zefan <[email protected]> · 2012-01-16 15:57:39 +08:00

This commit fixes a bug, while introducing a new one..

commit 7203ddbd4be9720649e47d756a001e0c7d7f8ae2
Author: Wang YanQing <[email protected]>
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 <[email protected]>
Acked-by: Wang YanQing <[email protected]>
Signed-off-by: Michal Marek <[email protected]>

Commit: 30c4eaafac80cc110efa66d2dfc551386eefdf53
Parents: 37ae2d59

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
scripts/kconfig/mconf.c	modified	+2	−1	View file

scripts/kconfig/mconf.c

View file

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 86cd1ea..2c6286c 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;