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 6d6d62c7b8273bbe4800ec0ed1434241d6210e1b..f847ad6880d6e2815b279981d53e522dc95120a4 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-13  Hui Zhu  <teawater@gmail.com>
            Pedro Alves  <palves@redhat.com>
 

diff --git a/gdb/remote.c b/gdb/remote.c
index 73deef21573f91dd541ab1f25f196191387e6716..04b818f8b85cb8b1fcb38f53c8fec2196238b4e9 100644 (file)
--- 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;
        }