Don't connect before process is started

Change-Id: I5692662476d2407c19c95567b97c9aa70975f9b4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

2 files changed, 6 insertions, 14 deletions

diff --git a/src/libs/codemodelbackendipc/connectionclient.cpp b/src/libs/codemodelbackendipc/connectionclient.cpp
index b8ff35e490..73d86b6de1 100644
--- a/src/libs/codemodelbackendipc/connectionclient.cpp
+++ b/src/libs/codemodelbackendipc/connectionclient.cpp
@@ -53,8 +53,7 @@ QString connectionName()
 }
 
 ConnectionClient::ConnectionClient(IpcClientInterface *client)
-    : serverProxy_(client, &localSocket),
-      isInConnectedMode(false)
+    : serverProxy_(client, &localSocket)
 {
     processAliveTimer.setInterval(10000);
 
@@ -68,14 +67,9 @@ ConnectionClient::~ConnectionClient()
 
 bool ConnectionClient::connectToServer()
 {
-    localSocket.connectToServer(connectionName());
-    isInConnectedMode = true;
-    bool isConnected = localSocket.waitForConnected();
-    if (!isConnected) {
-        startProcess();
-        resetProcessAliveTimer();
-        isConnected = retryToConnectToServer();
-    }
+    startProcess();
+    resetProcessAliveTimer();
+    const bool isConnected = connectToLocalSocket();
 
     return isConnected;
 }
@@ -83,7 +77,6 @@ bool ConnectionClient::connectToServer()
 bool ConnectionClient::disconnectFromServer()
 {
     localSocket.disconnectFromServer();
-    isInConnectedMode = false;
     if (localSocket.state() != QLocalSocket::UnconnectedState)
         return localSocket.waitForDisconnected();
 
@@ -132,7 +125,7 @@ void ConnectionClient::restartProcess()
     emit processRestarted();
 }
 
-bool ConnectionClient::retryToConnectToServer()
+bool ConnectionClient::connectToLocalSocket()
 {
     for (int counter = 0; counter < 1000; counter++) {
         localSocket.connectToServer(connectionName());
diff --git a/src/libs/codemodelbackendipc/connectionclient.h b/src/libs/codemodelbackendipc/connectionclient.h
index 3e336230e4..cc3632bd64 100644
--- a/src/libs/codemodelbackendipc/connectionclient.h
+++ b/src/libs/codemodelbackendipc/connectionclient.h
@@ -83,7 +83,7 @@ signals:
     void processRestarted();
 
 private:
-    bool retryToConnectToServer();
+    bool connectToLocalSocket();
     void endProcess();
     void terminateProcess();
     void killProcess();
@@ -98,7 +98,6 @@ private:
     IpcServerProxy serverProxy_;
     QTimer processAliveTimer;
     QString processPath_;
-    bool isInConnectedMode;
 };
 
 } // namespace CodeModelBackEnd