Skip to content
Snippets Groups Projects
Commit e8a844b3 authored by Francois Keith's avatar Francois Keith
Browse files

Correct signal destruction in rosSubscription.

parent cb10f3af
No related branches found
No related tags found
No related merge requests found
...@@ -183,7 +183,16 @@ namespace dynamicgraph ...@@ -183,7 +183,16 @@ namespace dynamicgraph
void RosSubscribe::rm (const std::string& signal) void RosSubscribe::rm (const std::string& signal)
{ {
std::string signalTs = signal+"Timestamp";
signalDeregistration(signal);
bindedSignal_.erase (signal); bindedSignal_.erase (signal);
if(bindedSignal_.find(signalTs) != bindedSignal_.end())
{
signalDeregistration(signalTs);
bindedSignal_.erase(signalTs);
}
} }
std::string RosSubscribe::list () std::string RosSubscribe::list ()
...@@ -199,7 +208,12 @@ namespace dynamicgraph ...@@ -199,7 +208,12 @@ namespace dynamicgraph
void RosSubscribe::clear () void RosSubscribe::clear ()
{ {
bindedSignal_.clear (); std::map<std::string, bindedSignal_t>::iterator it = bindedSignal_.begin();
for(; it!= bindedSignal_.end(); )
{
rm(it->first);
it = bindedSignal_.begin();
}
} }
std::string RosSubscribe::getDocString () const std::string RosSubscribe::getDocString () const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment