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

robot-api into feature/skillMemoryGUI

source/RobotAPI/libraries/skills/core/SkillDescription.h

@@ -30,6 +30,16 @@ namespace armarx
             static SkillDescription FromIce(const provider::dto::SkillDescription& i,
                                             const std::optional<ProviderID>& = std::nullopt);
             static SkillDescription FromIce(const manager::dto::SkillDescription& i);
+
+            bool
+            operator==(const SkillDescription& other) const
+            {
+                return this->skillId == other.skillId && this->description == other.description &&
+                       this->rootProfileDefaults == other.rootProfileDefaults &&
+                       this->timeout == other.timeout &&
+                       this->parametersType == other.parametersType &&
+                       this->resultType == other.resultType;
+            }
         };
 
         template <class T>

source/RobotAPI/libraries/skills_gui/memory/SkillManagerWrapper.cpp

@@ -205,6 +205,7 @@ namespace armarx::skills::gui
             try
             {
                 ARMARX_INFO << "Aborting skill '" << executionId.skillId.skillName << "'...";
+                std::scoped_lock l(mutex_memory);
                 this->memory->abortSkillAsync(executionId.toManagerIce());
             }
             catch (Ice::Exception const& e)