Skip to content
Snippets Groups Projects
Commit d1f8967c authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Handled the timeout and watchdog internally.

parent 11c363d4
No related branches found
No related tags found
1 merge request!4Handled the timeout and watchdog internally.
...@@ -869,11 +869,16 @@ bool CModuleAction<action_ros,dyn_reconf_config>::is_finished(void) ...@@ -869,11 +869,16 @@ bool CModuleAction<action_ros,dyn_reconf_config>::is_finished(void)
if(this->enabled) if(this->enabled)
{ {
if(this->is_timeout_active() || this->is_watchdog_active())
this->cancel();
action_state=action_client->getState(); action_state=action_client->getState();
if(action_state==actionlib::SimpleClientGoalState::ACTIVE || action_state==actionlib::SimpleClientGoalState::PENDING) if(action_state==actionlib::SimpleClientGoalState::ACTIVE || action_state==actionlib::SimpleClientGoalState::PENDING)
return false; return false;
else else
{
this->stop_timeout();
return true; return true;
}
} }
else else
return true; return true;
......
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