perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed
Arnaldo Carvalho de Melo [Sun, 16 May 2010 00:06:58 +0000 (21:06 -0300)]
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>

tools/perf/util/newt.c

index 094887f..139eb1a 100644 (file)
@@ -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