From 0d2bd018fdae9f49842892b4ea31532b466dda75 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Fri, 8 Dec 2006 22:06:04 +0000 Subject: [PATCH] (varobj_update): Ensure frame is restored when variable object is out of scope. --- gdb/varobj.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gdb/varobj.c b/gdb/varobj.c index ae247c5..39760ad 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -1052,6 +1052,12 @@ varobj_update (struct varobj **varp, struct varobj ***changelist) has changed. */ type_changed = 1; new = value_of_root (varp, &type_changed); + + /* Restore selected frame */ + fi = frame_find_by_id (old_fid); + if (fi) + select_frame (fi); + if (new == NULL) { (*varp)->error = 1; @@ -1147,11 +1153,6 @@ varobj_update (struct varobj **varp, struct varobj ***changelist) *(*changelist + changed) = NULL; } - /* Restore selected frame */ - fi = frame_find_by_id (old_fid); - if (fi) - select_frame (fi); - if (type_changed) return -2; else -- 2.7.4