Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gdb / tui / tui-winsource.c

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 69070115ec69ca99ef3d653d368c3fcdeb454e8d..fbee2e3e1813bc8acbcc393f9a704bb1d5230406 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -352,7 +352,11 @@ tui_source_window_base::refill ()
     {
       sal = get_current_source_symtab_and_line ();
       if (sal.symtab == NULL)
-       sal = find_pc_line (get_frame_pc (get_selected_frame (NULL)), 0);
+       {
+         struct frame_info *fi = deprecated_safe_get_selected_frame ();
+         if (fi != nullptr)
+           sal = find_pc_line (get_frame_pc (fi), 0);
+       }
     }
 
   if (sal.pspace == nullptr)