diff mbox

[3/4] gdb: Don't call tui_enable too early.

Message ID fd863876cb080ba9426f564f5539b97b3a0a8eee.1432163460.git.andrew.burgess@embecosm.com
State Committed
Headers show

Commit Message

Andrew Burgess May 20, 2015, 11:17 p.m. UTC 
Calling tui_enable too early in tui_layout_command can leave the tui in
an enabled state if the user has entered an invalid layout name.
Instead postpone the call to tui_enable until later in
tui_set_layout_for_display_command just before the layout is changed.

gdb/ChangeLog:

	* tui/tui-layout.c (tui_layout_command): Move call to tui_enable
	into ...
	(tui_set_layout_for_display_command): ...here, before calling
	tui_set_layout.  Only set the layout if gdb has not already
	entered the TUI_FAILURE state.
---
 gdb/ChangeLog        |  8 ++++++++
 gdb/tui/tui-layout.c | 10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51d2bfc..8ea1a5e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@ 
 2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
 
+	* tui/tui-layout.c (tui_layout_command): Move call to tui_enable
+	into ...
+	(tui_set_layout_for_display_command): ...here, before calling
+	tui_set_layout.  Only set the layout if gdb has not already
+	entered the TUI_FAILURE state.
+
+2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
+
 	* tui/tui-layout.c (layout_completer): New function.
 	(_initialize_tui_layout): Set completer on layout command.
 
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 45fa575..2e950f7 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -460,7 +460,12 @@  tui_set_layout_for_display_command (const char *layout_name)
 	  else
 	    status = TUI_FAILURE;
 
-	  tui_set_layout (new_layout);
+	  if (status == TUI_SUCCESS)
+	    {
+	      /* Make sure the curses mode is enabled.  */
+	      tui_enable ();
+	      tui_set_layout (new_layout);
+	    }
 	}
       xfree (buf_ptr);
     }
@@ -509,9 +514,6 @@  extract_display_start_addr (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p)
 static void
 tui_layout_command (char *arg, int from_tty)
 {
-  /* Make sure the curses mode is enabled.  */
-  tui_enable ();
-
   /* Switch to the selected layout.  */
   if (tui_set_layout_for_display_command (arg) != TUI_SUCCESS)
     warning (_("Invalid layout specified.\n%s"), LAYOUT_USAGE);