Merge branch 'feature/skillMemoryGUI' of...

Merge branch 'feature/skillMemoryGUI' of git.h2t.iar.kit.edu:sw/armarx/robot-api into feature/skillMemoryGUI

source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp

@@ -601,7 +601,7 @@ namespace armarx
 
         ARMARX_INFO << "Stopping skill from GUI: " << selectedSkill.skillExecutionId.toString();
 
-        memory->abortSkill(selectedSkill.skillExecutionId.toManagerIce());
+        memory->abortSkillAsync(selectedSkill.skillExecutionId.toManagerIce());
     }
 
     void

source/RobotAPI/libraries/skills/provider/detail/SkillImplementationWrapper.cpp

@@ -275,12 +275,18 @@ namespace armarx
             try
             {
                 mainRet = skill->mainOfSkill();
-                if (mainRet.status != TerminatedSkillStatus::Succeeded)
+                if (mainRet.status == TerminatedSkillStatus::Failed)
                 {
-                    std::string message = "SkillError 501: The main method of skill '" + skillName +
-                                          "' did not succeed.";
+                    std::string message =
+                        "SkillError 501: The main method of skill '" + skillName + "' did fail.";
                     return exitAndMakeFailedResult(message);
                 }
+                else if (mainRet.status == TerminatedSkillStatus::Aborted)
+                {
+                    std::string message =
+                        "SkillError 501: The main method of skill '" + skillName + "' got aborted.";
+                    return exitAndMakeAbortedResult(message);
+                }
             }
             catch (const error::SkillAbortedException& ex)
             {