From 1535140cb90ee34acabe418e99a8acc340698e07 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 22 Mar 2010 13:10:25 -0300
Subject: [PATCH] --- yaml --- r: 191127 b: refs/heads/master c:
 f3a1f0ea9432ec395cd112f42201e8e523c07bc5 h: refs/heads/master i:   191125:
 8ce213088344848cee2ce8d62e6df3e7634e325b   191123:
 b264995d55226f2bdcc38f28eba21f06bcc5f1c8   191119:
 18378e743922b256d98f31a981a77abc35bbb09e v: v3

---
 [refs]                        |  2 +-
 trunk/tools/perf/perf.c       |  4 ++--
 trunk/tools/perf/util/cache.h |  4 ++--
 trunk/tools/perf/util/newt.c  | 19 +++++++++++++------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 24f2ed63a3a7..90440bb43496 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 301fde27c7fcd0380b02b175d547e894ff65d78a
+refs/heads/master: f3a1f0ea9432ec395cd112f42201e8e523c07bc5
diff --git a/trunk/tools/perf/perf.c b/trunk/tools/perf/perf.c
index d2de8393a33c..2826e702986e 100644
--- a/trunk/tools/perf/perf.c
+++ b/trunk/tools/perf/perf.c
@@ -264,11 +264,11 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	set_debugfs_path();
 
 	status = p->fn(argc, argv, prefix);
+	exit_browser(status);
+
 	if (status)
 		return status & 0xff;
 
-	exit_browser();
-
 	/* Somebody closed stdout? */
 	if (fstat(fileno(stdout), &st))
 		return 0;
diff --git a/trunk/tools/perf/util/cache.h b/trunk/tools/perf/util/cache.h
index 47b12a3d11bf..4b9aab7f0405 100644
--- a/trunk/tools/perf/util/cache.h
+++ b/trunk/tools/perf/util/cache.h
@@ -77,10 +77,10 @@ static inline void setup_browser(void)
 {
 	setup_pager();
 }
-static inline void exit_browser(void) {}
+static inline void exit_browser(bool wait_for_ok __used) {}
 #else
 void setup_browser(void);
-void exit_browser(void);
+void exit_browser(bool wait_for_ok);
 #endif
 
 extern const char *editor_program;
diff --git a/trunk/tools/perf/util/newt.c b/trunk/tools/perf/util/newt.c
index 2d19e7a3e6e8..3c2ef95d940a 100644
--- a/trunk/tools/perf/util/newt.c
+++ b/trunk/tools/perf/util/newt.c
@@ -170,18 +170,20 @@ void perf_session__browse_hists(struct rb_root *hists, u64 session_total,
 	newtFormDestroy(form);
 }
 
+static char browser__last_msg[1024];
+
 int browser__show_help(const char *format, va_list ap)
 {
 	int ret;
 	static int backlog;
-	static char msg[1024];
 
-        ret = vsnprintf(msg + backlog, sizeof(msg) - backlog, format, ap);
+        ret = vsnprintf(browser__last_msg + backlog,
+			sizeof(browser__last_msg) - backlog, format, ap);
 	backlog += ret;
 
-	if (msg[backlog - 1] == '\n') {
+	if (browser__last_msg[backlog - 1] == '\n') {
 		newtPopHelpLine();
-		newtPushHelpLine(msg);
+		newtPushHelpLine(browser__last_msg);
 		newtRefresh();
 		backlog = 0;
 	}
@@ -200,8 +202,13 @@ void setup_browser(void)
 	newtPushHelpLine(" ");
 }
 
-void exit_browser(void)
+void exit_browser(bool wait_for_ok)
 {
-	if (use_browser)
+	if (use_browser) {
+		if (wait_for_ok) {
+			char title[] = "Fatal Error", ok[] = "Ok";
+			newtWinMessage(title, ok, browser__last_msg);
+		}
 		newtFinished();
+	}
 }