This change contains changes that were made on a separate copy of this code,...

src/trusted/gdb_rsp/host.cc

 /*
  * Copyright 2010 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ skipping 222 matching lines @@
     // We are running again
     status_ = HS_RUNNING;
     return true;
   }
 
   return false;
 }
 
 // Wait to see if we receive a break
 bool Host::WaitForBreak() {
-  // We can not wait if we are not running
-  if (HS_RUNNING != status_) return false;
+  // We can not wait if we are already stopped
+  if (HS_RUNNING != status_ &&
+      HS_STOPPING != status_) return false;
 
   Packet rx;
   std::string str;
   if (session_->GetPacket(&rx) == false) return false;
 
   rx.GetString(&str);
   if (ParseStopPacket(str.data())) return Update();
   return false;
 }
 
@@ skipping 260 matching lines @@
 }
 
 bool Host::Send(Packet *tx, Packet *rx) {
   if (!session_->SendPacket(tx)) return false;
   return session_->GetPacket(rx);
 }
 
 }  // namespace gdb_rsp