Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 30c4eaafac80cc110efa66d2dfc551386eefdf53

Authored by Li Zefan
Committed by Michal Marek
1 parent 37ae2d5998
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

scripts/kconfig/mconf.c
Diff comments   View file @ 30c4eaa
... ... @@ -830,7 +830,8 @@
830 830 fprintf(stderr, _("\n\n"
831 831 "Your configuration changes were NOT saved."
832 832 "\n\n"));
833   - res = 0;
  833 + if (res != KEY_ESC)
  834 + res = 0;
834 835 }
835 836  
836 837 return res;