Disable IPC proxies when not used

Pelagicore · Apr 29, 2020 · 20b6966 · 20b6966
1 parent c8817ad
commit 20b6966
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/src/ipc/ipc-common/IPCProxy.h b/src/ipc/ipc-common/IPCProxy.h
@@ -61,17 +61,19 @@ class IPCProxy : public WrapperType, public IPCProxyNewBase
     {
         QObject::connect(ipc(), &IPCProxyBinderBase::complete, this, [this] () {
                 m_localProviderBinder.init();
-                auto serviceName = ipc()->serviceName();
-                auto objPath = ipc()->objectPath();
-                for (auto& proxy : m_ipcProxies) {
-                    auto proxyAdapterIPCBinder = proxy.ipcBinder;
-                    if (proxyAdapterIPCBinder != nullptr) {
-                        proxyAdapterIPCBinder->setObjectPath(objPath);
-                        if(!serviceName.isEmpty()) {
-                            proxyAdapterIPCBinder->setServiceName(serviceName);
+                if (m_localProviderBinder.provider() == nullptr) {
+                    auto serviceName = ipc()->serviceName();
+                    auto objPath = ipc()->objectPath();
+                    for (auto& proxy : m_ipcProxies) {
+                        auto proxyAdapterIPCBinder = proxy.ipcBinder;
+                        if (proxyAdapterIPCBinder != nullptr) {
+                            proxyAdapterIPCBinder->setObjectPath(objPath);
+                            if(!serviceName.isEmpty()) {
+                                proxyAdapterIPCBinder->setServiceName(serviceName);
+                            }
+                            proxyAdapterIPCBinder->connectToServer();
+                            QObject::connect(proxyAdapterIPCBinder, &IPCProxyBinderBase::serviceAvailableChanged, this, &IPCProxy::refreshProvider);
                         }
-                        proxyAdapterIPCBinder->connectToServer();
-                        QObject::connect(proxyAdapterIPCBinder, &IPCProxyBinderBase::serviceAvailableChanged, this, &IPCProxy::refreshProvider);
                     }
                 }
                 this->refreshProvider();
@@ -85,11 +87,18 @@ class IPCProxy : public WrapperType, public IPCProxyNewBase
         InterfaceType *provider = m_defaultProvider;
         if (m_localProviderBinder.provider() != nullptr) {
             provider = m_localProviderBinder.provider();
+            for (auto& proxy : m_ipcProxies) {
+                auto ipcBinder = proxy.ipcBinder;
+                if (ipcBinder != nullptr) {
+                    ipcBinder->setEnabled(false);
+                }
+            }
         } else {
             for (auto& proxy : m_ipcProxies) {
-                auto proxyAdapterIPCBinder = proxy.ipcBinder;
-                if ((proxyAdapterIPCBinder != nullptr) && proxyAdapterIPCBinder->isServiceAvailable()) {
+                auto ipcBinder = proxy.ipcBinder;
+                if ((ipcBinder != nullptr) && ipcBinder->isServiceAvailable()) {
                     provider = proxy.proxy;
+                    ipcBinder->setEnabled(true);
                     break;
                 }
             }