From 6f18cf23da71508a09868e18422b2568c10e289d Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Fri, 30 Jun 2017 10:19:59 +0200
Subject: [PATCH] Merge channels from config to device, instead of replace

---
 fairmq/FairMQDevice.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index 830088cd..e17dac10 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -968,7 +968,13 @@ void FairMQDevice::SetConfig(FairMQProgOptions& config)
 {
     fExternalConfig = true;
     fConfig = &config;
-    fChannels = config.GetFairMQMap();
+    for (auto& c : config.GetFairMQMap())
+    {
+        if (!fChannels.insert(c).second)
+        {
+            LOG(WARN) << "FairMQDevice::SetConfig: did not insert channel '" << c.first << "', it is already in the device.";
+        }
+    }
     fDefaultTransport = config.GetValue<string>("transport");
     SetTransport(fDefaultTransport);
     fId = config.GetValue<string>("id");