2010-03-26 Stan Shebs <stan@codesourcery.com>

	* tracepoint.c (disconnect_or_stop_tracing): Get out of tfind mode.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d539e8f9e2afd2a63b7060babe20d31af6c6c4d1..6f7ef2219764aa20157511303f3c86165366e31c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-26  Stan Shebs  <stan@codesourcery.com>
+
+       * tracepoint.c (disconnect_or_stop_tracing): Get out of tfind mode.
+
 2010-03-26  Tom Tromey  <tromey@redhat.com>
 
        * breakpoint.c (commands_command_1): Duplicate 'arg'.

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 42210d4db1625ec2000327cebe8e64c9a09bd6ca..daa2161703c65399bdbc8f9799889a6576d8eb26 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1745,6 +1745,13 @@ disconnect_or_stop_tracing (int from_tty)
       if (!cont)
        stop_tracing ();
     }
+
+  /* Also we want to be out of tfind mode, otherwise things can get
+     confusing upon reconnection.  Just use these calls instead of
+     full tfind_1 behavior because we're in the middle of detaching,
+     and there's no point to updating current stack frame etc.  */
+  set_traceframe_number (-1);
+  set_traceframe_context (NULL);
 }
 
 /* Worker function for the various flavors of the tfind command.  */