Don't use application when connection to it fails.

Task-number: QTSIM-186
Reviewed-by: owolff
Reviewed-by: ckamm

2 files changed, 6 insertions, 0 deletions

diff --git a/src/other/application.cpp b/src/other/application.cpp
index 1352bda..083265e 100644
--- a/src/other/application.cpp
+++ b/src/other/application.cpp
@@ -60,6 +60,7 @@ Application::Application(const QString &name, int id, qint64 pid, QLocalSocket *
 
     sendSocket = new QLocalSocket(this);
     sendSocket->connectToServer(QtSimulatorPrivate::qt_applicationServerName(pid));
+    sendSocket->waitForConnected(); // don't check return value
 
     QtSimulatorPrivate::qt_registerUserTypes();
 }
diff --git a/src/other/applicationmanager.cpp b/src/other/applicationmanager.cpp
index dd3b63e..c1697ee 100644
--- a/src/other/applicationmanager.cpp
+++ b/src/other/applicationmanager.cpp
@@ -271,6 +271,11 @@ void ApplicationManager::handleConnection()
     gAppIdCounter++;
     Application *app = new Application(QString::fromLatin1(cmd.request.applicationName),
                                        cmd.reply.appId, cmd.request.applicationPid, socket, this);
+    if ( !app->socket()->isOpen()) {
+      qWarning("Could not connect to application: Make sure %s has read/write permissions to the application socket.", qPrintable(qApp->applicationName()));
+      delete app;
+      return;
+    }
     VersionStruct version;
     version = cmd.request.version;
     app->setClientVersion(version);