From fb487caec38c0da7a43bab850af6aa79b07befde Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 5 Dec 2017 16:51:25 +0100 Subject: Hold all contexts (plugin & source) in signalCtx_ Keeping persistence between call data are kept in that member also subscription Action now use getSignals_ context and no more the signal one, this is more accurate and simples Change-Id: Idd7c56ba30f1daa9eaf9b99a7261d58189ef0bb2 Signed-off-by: Romain Forlot --- signal-composer-binding/source.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'signal-composer-binding/source.cpp') diff --git a/signal-composer-binding/source.cpp b/signal-composer-binding/source.cpp index 6ad9511..3180513 100644 --- a/signal-composer-binding/source.cpp +++ b/signal-composer-binding/source.cpp @@ -113,11 +113,13 @@ void SourceAPI::makeSubscription() break; } source.uid = sig.first.c_str(); - source.context = (void*)sig.second->get_context(); + source.context = getSignals_->type == CTL_TYPE_CB ? + getSignals_->exec.cb.plugin->context: + nullptr; ActionExecOne(&source, getSignals_, signalJ); // Considerate signal subscribed no matter what sig.second->subscribed_ = true; - delete((struct signalCBT*)source.context); + json_object_put(signalJ); } source.uid = ""; ActionExecOne(&source, getSignals_, nullptr); -- cgit 1.2.3-korg