In the action_done callback, the action status is only updated if the tiemout...

In the action_done callback, the action status is only updated if the tiemout and watchdog have not been activated.

include/iri_ros_tools/module_action.h

@@ -217,26 +217,29 @@ class CModuleAction
     void action_done(const actionlib::SimpleClientGoalState& state,const ResultConstPtr& result)
     {
       this->action_access.enter();
-      if(state==actionlib::SimpleClientGoalState::ABORTED)
+      if(this->status==ACTION_RUNNING)
       {
-        ROS_ERROR_STREAM("CModuleAction::action_done: goal on server " << this->name << " aborted");
-        this->status=ACTION_ABORTED;
-      }
-      if(state==actionlib::SimpleClientGoalState::REJECTED)
-      {
-        ROS_ERROR_STREAM("CModuleAction::action_done: goal on server " << this->name << " rejected");
-        this->status=ACTION_REJECTED;
-      }
-      else if(state==actionlib::SimpleClientGoalState::PREEMPTED)
-      {
-        ROS_WARN_STREAM("CModuleAction::action_done: goal on server " << this->name << " preempted");
-        this->status=ACTION_PREEMPTED;
+        if(state==actionlib::SimpleClientGoalState::ABORTED)
+        {
+          ROS_ERROR_STREAM("CModuleAction::action_done: goal on server " << this->name << " aborted");
+          this->status=ACTION_ABORTED;
+        }
+        if(state==actionlib::SimpleClientGoalState::REJECTED)
+        {
+          ROS_ERROR_STREAM("CModuleAction::action_done: goal on server " << this->name << " rejected");
+          this->status=ACTION_REJECTED;
+        }
+        else if(state==actionlib::SimpleClientGoalState::PREEMPTED)
+        {
+          ROS_WARN_STREAM("CModuleAction::action_done: goal on server " << this->name << " preempted");
+          this->status=ACTION_PREEMPTED;
+        }
+        else if(state==actionlib::SimpleClientGoalState::SUCCEEDED)
+        {
+          ROS_INFO_STREAM("CModuleAction::action_done: goal on server " << this->name << " successfull");
+          this->status=ACTION_SUCCESS;
+        } 
       }
-      else if(state==actionlib::SimpleClientGoalState::SUCCEEDED)
-      {
-        ROS_INFO_STREAM("CModuleAction::action_done: goal on server " << this->name << " successfull");
-        this->status=ACTION_SUCCESS;
-      } 
       this->action_result_msg=*result;
       this->action_feedback_msg=Feedback();
       this->action_access.exit();