From: Stan Shebs <shebs@codesourcery.com>
Date: Sat, 27 Mar 2010 00:12:34 +0000 (+0000)
Subject: 2010-03-26  Stan Shebs  <stan@codesourcery.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8b9b7ef838c598bb3aaf224e6cd515a6f7e26364;p=deliverable%2Fbinutils-gdb.git

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 d539e8f9e2..6f7ef22197 100644
--- 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 42210d4db1..daa2161703 100644
--- 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.  */