Fixed the logic of detecting native apps that support the ApplicationInterface

Change-Id: I5987649f2843fa8f4c7dbb3fe5e7ae37a7cad8ae
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

1 files changed, 9 insertions, 7 deletions

diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp
index 89872877..69701b01 100644
--- a/src/manager-lib/nativeruntime.cpp
+++ b/src/manager-lib/nativeruntime.cpp
@@ -444,18 +444,20 @@ void NativeRuntime::onDBusPeerConnection(const QDBusConnection &connection)
 
 void NativeRuntime::onApplicationFinishedInitialization()
 {
-    if (m_needsLauncher && m_launchWhenReady && !m_applicationInterfaceConnected && m_app && m_runtimeInterface) {
+    if (!m_applicationInterfaceConnected) {
         registerExtensionInterfaces();
 
-        QString baseDir = m_container->mapHostPathToContainer(m_app->codeDir());
-        QString pathInContainer = m_container->mapHostPathToContainer(m_app->absoluteCodeFilePath());
+        if (m_needsLauncher && m_launchWhenReady &&  m_app && m_runtimeInterface) {
+
+            QString baseDir = m_container->mapHostPathToContainer(m_app->codeDir());
+            QString pathInContainer = m_container->mapHostPathToContainer(m_app->absoluteCodeFilePath());
 
-        emit m_runtimeInterface->startApplication(baseDir, pathInContainer, m_document, m_mimeType,
-                                                  convertFromJSVariant(QVariant(m_app->toVariantMap())).toMap(),
-                                                  convertFromJSVariant(QVariant(systemProperties())).toMap());
+            emit m_runtimeInterface->startApplication(baseDir, pathInContainer, m_document, m_mimeType,
+                                                      convertFromJSVariant(QVariant(m_app->toVariantMap())).toMap(),
+                                                      convertFromJSVariant(QVariant(systemProperties())).toMap());
+        }
         m_applicationInterfaceConnected = true;
     }
-
     setState(Active);
 }