* thread.c (restore_selected_frame): Handle frame_level == -1.

	(make_cleanup_restore_current_thread): Use
	get_selected_frame_if_set.
	* frame.h (get_selected_frame_if_set): Declare.
	* frame.c (get_selected_frame_if_set): New function.

1 files changed, 3 insertions, 0 deletions

diff --git a/gdb/frame.h b/gdb/frame.h
index 2c5276e0fa6..252b75e0539 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -260,6 +260,9 @@ extern void reinit_frame_cache (void);
    and then return that thread's previously selected frame.  */
 extern struct frame_info *get_selected_frame (const char *message);
 
+/* If there is a selected frame, return it.  Otherwise, return NULL.  */
+extern struct frame_info *get_selected_frame_if_set (void);
+
 /* Select a specific frame.  NULL, apparently implies re-select the
    inner most frame.  */
 extern void select_frame (struct frame_info *);