From e21458b242c4b5f6d3a07e88d22130160f4fb7f1 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Wed, 10 Jun 2009 23:39:45 +0000
Subject: [PATCH] 	* varobj.c (varobj_create): Properly restore the
 selected frame.

---
 gdb/ChangeLog | 4 ++++
 gdb/varobj.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 000b6e80d1a..5b23ea78ffe 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-11  Pedro Alves  <pedro@codesourcery.com>
+
+	* varobj.c (varobj_create): Properly restore the selected frame.
+
 2009-06-05  Tom Tromey  <tromey@redhat.com>
 
 	* inferior.c (print_inferior): Make a table, not a list.  Emit
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 9729766e468..7df7fed2446 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -577,7 +577,7 @@ varobj_create (char *objname,
       var->root->rootvar = var;
 
       /* Reset the selected frame */
-      if (fi != NULL)
+      if (old_fi != NULL)
 	select_frame (old_fi);
     }
 
-- 
2.30.2