diff options
Diffstat (limited to 'gdb/guile')
| -rw-r--r-- | gdb/guile/scm-ports.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gdb/guile/scm-ports.c b/gdb/guile/scm-ports.c index 735abc2..78187c4 100644 --- a/gdb/guile/scm-ports.c +++ b/gdb/guile/scm-ports.c @@ -26,6 +26,7 @@ #include "top.h" #include "target.h" #include "guile-internal.h" +#include "common/gdb_optional.h" #ifdef HAVE_POLL #if defined (HAVE_POLL_H) @@ -477,17 +478,20 @@ ioscm_with_output_to_port_worker (SCM port, SCM thunk, enum oport oport, scoped_restore save_file = make_scoped_restore (oport == GDB_STDERR ? &gdb_stderr : &gdb_stdout); - if (oport == GDB_STDERR) - gdb_stderr = port_file.get (); - else - { - current_uiout->redirect (port_file.get ()); - make_cleanup_ui_out_redirect_pop (current_uiout); + { + gdb::optional<ui_out_redirect_pop> redirect_popper; + if (oport == GDB_STDERR) + gdb_stderr = port_file.get (); + else + { + current_uiout->redirect (port_file.get ()); + redirect_popper.emplace (current_uiout); - gdb_stdout = port_file.get (); - } + gdb_stdout = port_file.get (); + } - result = gdbscm_safe_call_0 (thunk, NULL); + result = gdbscm_safe_call_0 (thunk, NULL); + } do_cleanups (cleanups); |