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 bbfbf8b65aab37fefa7ded39512618aafe40d15e..d18163e88c78696df3893750b1d2cfe6e6f27915 100644 (file)
--- 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 c2460677a54a7a5f7e7de4e41d1d7608b2d31506..caf6116837f12c78909d6251cae803044085f16e 100644 (file)
--- 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;
        }