From: Pedro Alves <palves@redhat.com>
Date: Tue, 20 Mar 2012 18:14:16 +0000 (+0000)
Subject: 2012-03-20  Pedro Alves  <palves@redhat.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e278ad5be65114f92eba2b2609bddd7c058376a8;p=binutils-gdb.git

2012-03-20  Pedro Alves  <palves@redhat.com>

	* remote.c (remote_start_remote): Clear `rs->starting_up' on early
	returns.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bbfbf8b65aa..d18163e88c7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-20  Pedro Alves  <palves@redhat.com>
+
+	* remote.c (remote_start_remote): Clear `rs->starting_up' on early
+	returns.
+
 2012-03-20  Yao Qi  <yao@codesourcery.com>
 
 	* amd64-tdep.c (amd64_displaced_step_copy_insn): Complete missing "}" in
diff --git a/gdb/remote.c b/gdb/remote.c
index c2460677a54..caf6116837f 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -3378,6 +3378,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
 
 	  /* We're connected, but not running.  Drop out before we
 	     call start_remote.  */
+	  rs->starting_up = 0;
 	  return;
 	}
       else
@@ -3469,6 +3470,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
 
 	  /* We're connected, but not running.  Drop out before we
 	     call start_remote.  */
+	  rs->starting_up = 0;
 	  return;
 	}