summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-05-15 21:06:58 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2010-05-15 21:06:58 -0300
commit29351db6a05e7e42be457569428425520a18beec (patch)
treefc6bb2bd3a4b371f41fd7ee698fbdcaac4bf94a3
parentc1ec5fefd9cd9ccb020966a49a3c7f44b25d9e84 (diff)
downloadlinux-29351db6a05e7e42be457569428425520a18beec.tar.bz2
perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed
ESC still asks for confirmation. Suggested-by: Ingo Molnar <mingo@elte.hu> Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/newt.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index 094887f45d05..139eb1a16cd8 100644
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -837,9 +837,10 @@ int hists__browse(struct hists *self, const char *helpline, const char *input_na
if (es.reason == NEWT_EXIT_HOTKEY) {
if (toupper(es.u.key) == 'A')
goto do_annotate;
- if (es.u.key == NEWT_KEY_ESCAPE ||
- toupper(es.u.key) == 'Q' ||
- es.u.key == CTRL('c')) {
+ if (toupper(es.u.key) == 'Q' ||
+ es.u.key == CTRL('c'))
+ break;
+ if (es.u.key == NEWT_KEY_ESCAPE) {
if (dialog_yesno("Do you really want to exit?"))
break;
else