X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-interp.c;h=1e1d64323213ebcd3a4518b33beda780f137e33f;hb=6d012f143df40b0870ee1f64940080c1591801a3;hp=0c1effb31f6ed7ca06b9d6f6b7b3825993fc6178;hpb=63858210357ce3f90a264895e9780ab302576a94;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index 0c1effb31f..1e1d643232 100644
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -25,11 +25,12 @@
 #include "event-top.h"
 #include "event-loop.h"
 #include "ui-out.h"
-#include "tui/tuiData.h"
+#include "cli-out.h"
+#include "tui/tui-data.h"
 #include "readline/readline.h"
-#include "tui/tuiWin.h"
+#include "tui/tui-win.h"
 #include "tui/tui.h"
-#include "tui/tuiIO.h"
+#include "tui/tui-io.h"
 
 /* Set to 1 when the TUI mode must be activated when we first start gdb.  */
 static int tui_start_enabled = 0;
@@ -52,7 +53,7 @@ tui_init (void)
   /* Install exit handler to leave the screen in a good shape.  */
   atexit (tui_exit);
 
-  initializeStaticData ();
+  tui_initialize_static_data ();
 
   tui_initialize_io ();
   tui_initialize_readline ();
@@ -63,7 +64,23 @@ tui_init (void)
 static int
 tui_resume (void *data)
 {
+  struct ui_file *stream;
+
+  /* gdb_setup_readline will change gdb_stdout.  If the TUI was previously
+     writing to gdb_stdout, then set it to the new gdb_stdout afterwards.  */
+
+  stream = cli_out_set_stream (tui_old_uiout, gdb_stdout);
+  if (stream != gdb_stdout)
+    {
+      cli_out_set_stream (tui_old_uiout, stream);
+      stream = NULL;
+    }
+
   gdb_setup_readline ();
+
+  if (stream != NULL)
+    cli_out_set_stream (tui_old_uiout, gdb_stdout);
+
   if (tui_start_enabled)
     tui_enable ();
   return 1;