From: Pedro Alves <palves@redhat.com>
Date: Tue, 20 Mar 2012 18:43:23 +0000 (+0000)
Subject: 2012-03-20  Pedro Alves  <palves@redhat.com>
X-Git-Tag: gdb_7_4_1-2012-04-26-release~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61a9d312b0c06e9caf4b00336a2a5db510f59af9;p=thirdparty%2Fbinutils-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 6d6d62c7b82..f847ad6880d 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-13  Hui Zhu  <teawater@gmail.com>
 	    Pedro Alves  <palves@redhat.com>
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 73deef21573..04b818f8b85 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -3268,6 +3268,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
@@ -3374,6 +3375,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;
 	}