Debugger: Fix Android startup

Change-Id: I495412434ccffdb33528bbbe030c7a4bfa7e387c
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 5 insertions, 18 deletions

diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 54441be1eb..d994b25021 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -476,6 +476,7 @@ void GdbRemoteServerEngine::notifyEngineRemoteServerRunning
     m_isMulti = true;
     m_targetPid = inferiorPid;
     m_serverChannel = serverChannel;
+    m_startAttempted = true;
     startGdb();
 }
 
@@ -489,27 +490,13 @@ void GdbRemoteServerEngine::notifyEngineRemoteSetupFinished(const RemoteSetupRes
         return;
     }
 
-    DebuggerStartParameters &params = isMasterEngine()
-            ? startParameters()  : masterEngine()->startParameters();
-    if (result.gdbServerPort != -1) {
-        QString &rc = params.remoteChannel;
-        const int sepIndex = rc.lastIndexOf(QLatin1Char(':'));
-        if (sepIndex != -1) {
-            rc.replace(sepIndex + 1, rc.count() - sepIndex - 1,
-                       QString::number(result.gdbServerPort));
-        }
-    }
-    if (result.qmlServerPort != -1) {
-        params.qmlServerPort = result.qmlServerPort;
-        params.processArgs.replace(_("%qml_port%"), QString::number(result.qmlServerPort));
-    }
-
     // TODO: Aren't these redundant?
-    m_isMulti = params.multiProcess;
+    m_isMulti = startParameters().multiProcess;
     m_targetPid = -1;
-    m_serverChannel = params.remoteChannel.toLatin1();
+    m_serverChannel = startParameters().remoteChannel.toLatin1();
 
-    startGdb();
+    if (!m_startAttempted)
+        startGdb();
 }
 
 } // namespace Internal