diff --git a/include/iri_ros_tools/module_action.h b/include/iri_ros_tools/module_action.h index cc6c7f0f4a7554649e2104a54828d10068272a5c..a74dc2f222eedb47322ebfa729ade0602c4a5f88 100644 --- a/include/iri_ros_tools/module_action.h +++ b/include/iri_ros_tools/module_action.h @@ -664,12 +664,9 @@ void CModuleAction<action_ros>::cancel(void) { actionlib::SimpleClientGoalState action_state(actionlib::SimpleClientGoalState::PENDING); - if(this->status==ACTION_RUNNING) - { - action_state=action_client->getState(); - if(action_state==actionlib::SimpleClientGoalState::ACTIVE) - this->action_client->cancelGoal(); - } + action_state=action_client->getState(); + if(action_state==actionlib::SimpleClientGoalState::ACTIVE) + this->action_client->cancelGoal(); } template<class action_ros> @@ -677,14 +674,9 @@ bool CModuleAction<action_ros>::is_finished(void) { actionlib::SimpleClientGoalState action_state(actionlib::SimpleClientGoalState::PENDING); - if(this->status==ACTION_RUNNING) - { - action_state=action_client->getState(); - if(action_state==actionlib::SimpleClientGoalState::ACTIVE) - return false; - else - return true; - } + action_state=action_client->getState(); + if(action_state==actionlib::SimpleClientGoalState::ACTIVE) + return false; else return true; }