Only master knows about devices, so only call addDevice callback on master

Author: hpcdgrie

src/OpenCOVER/cover/input/deviceDiscovery.cpp

@@ -79,37 +79,38 @@ namespace opencover
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mutex);
         int numToAdd = toAdd.size();
         coVRMSController::instance()->syncData(&numToAdd, sizeof(numToAdd));
-	if (coVRMSController::instance()->isMaster())
-	{  
-	    for(const auto &i:toAdd)
-	    {
-            devices.push_back(i);
-            int len = i->pluginName.length();
-            coVRMSController::instance()->sendSlaves(&len, sizeof(len));
-            coVRMSController::instance()->sendSlaves(i->pluginName.c_str(), len + 1);
-            cover->addPlugin(i->pluginName.c_str());
-	    }
-	}
-	else
-	{
-	    for(int i=0;i<numToAdd;i++)
-	    {
-		std::string pluginName;
-		int len = 0;
-		char buf[1000];
-		coVRMSController::instance()->readMaster(&len, sizeof(len));
-		coVRMSController::instance()->readMaster(buf, len+1);
-		cover->addPlugin(buf);
-	    }
-    }
-    toAdd.clear();
-    auto firstNew = devices.end() - numToAdd;
-    for (int i = 0; i < numToAdd; i++)
-    {
-        deviceAdded(*firstNew);
-        ++firstNew;
-    }
+        if (coVRMSController::instance()->isMaster())
+        {  
+            for(const auto &i:toAdd)
+            {
+                devices.push_back(i);
+                int len = i->pluginName.length();
+                coVRMSController::instance()->sendSlaves(&len, sizeof(len));
+                coVRMSController::instance()->sendSlaves(i->pluginName.c_str(), len + 1);
+                cover->addPlugin(i->pluginName.c_str());
+            }
+            auto firstNew = devices.end() - numToAdd;
+            for (int i = 0; i < numToAdd; i++)
+            {
+                deviceAdded(*firstNew);
+                ++firstNew;
+            }
+        }
+        else
+        {
+            for(int i=0;i<numToAdd;i++)
+            {
+                std::string pluginName;
+                int len = 0;
+                char buf[1000];
+                coVRMSController::instance()->readMaster(&len, sizeof(len));
+                coVRMSController::instance()->readMaster(buf, len+1);
+                cover->addPlugin(buf);
+            }
+        }
+        toAdd.clear();
     }
+
     void deviceDiscovery::run()
     {
         covise::setThreadName("deviceDiscoveryThread");

src/OpenCOVER/cover/input/deviceDiscovery.h

@@ -58,6 +58,7 @@ namespace opencover
 
         // only to be used from main thread
         const std::vector<const deviceInfo *> &getDevices() const;
+        // only called on master, slaves don't know about devices
         sigslot::signal<const deviceInfo *> deviceAdded;
 
     private: