Include the qLaunchSuccess and qC packets in the

10 second timeout zone. When launching we increase the
timeout to 10 seconds to ensure we have time to launch a
process, and then set it back.

llvm-svn: 137256

1 files changed, 2 insertions, 1 deletions

diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index b1a48b2dc9c..63967148cb5 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -531,7 +531,6 @@ ProcessGDBRemote::DoLaunch
 
             const uint32_t old_packet_timeout = m_gdb_comm.SetPacketTimeout (10);
             int arg_packet_err = m_gdb_comm.SendArgumentsPacket (argv);
-            m_gdb_comm.SetPacketTimeout (old_packet_timeout);
             if (arg_packet_err == 0)
             {
                 std::string error_str;
@@ -548,6 +547,8 @@ ProcessGDBRemote::DoLaunch
             {
                 error.SetErrorStringWithFormat("'A' packet returned an error: %i.\n", arg_packet_err);
             }
+            
+            m_gdb_comm.SetPacketTimeout (old_packet_timeout);
                 
             if (GetID() == LLDB_INVALID_PROCESS_ID)
             {