From 1b4bbe3b4f048754fe90e93546126f1d161d8037 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 11 Dec 2017 13:36:17 +0100 Subject: Avoid create duplicate source entries. Change-Id: If50a439634382fa6d1c856b5c3fb29db4eb93a31 Signed-off-by: Romain Forlot --- signal-composer-binding/signal-composer.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'signal-composer-binding/signal-composer.cpp') diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp index 4a0346c..0fb3f3d 100644 --- a/signal-composer-binding/signal-composer.cpp +++ b/signal-composer-binding/signal-composer.cpp @@ -300,6 +300,16 @@ int Composer::loadOneSourceAPI(json_object* sourceJ) return err; } + // Checking duplicate entry and ignore if so + for(auto& src: sourcesListV_) + { + if(*src == uid) + { + json_object_put(sourceJ); + return 0; + } + } + if(ctlConfig_ && ctlConfig_->requireJ) { const char* requireS = json_object_to_json_string(ctlConfig_->requireJ); @@ -322,7 +332,7 @@ int Composer::loadOneSourceAPI(json_object* sourceJ) onReceivedCtl = onReceivedJ ? convert2Action("onReceived", onReceivedJ) : nullptr; - sourcesListV_.push_back(std::make_shared(api, info, initCtl, getSignalsCtl, onReceivedCtl, retention)); + sourcesListV_.push_back(std::make_shared(uid, api, info, initCtl, getSignalsCtl, onReceivedCtl, retention)); return err; } -- cgit 1.2.3-korg