Skip to content
Snippets Groups Projects
Commit fa6f5ad0 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'master' into names

parents 8bb87070 f48baad8
No related branches found
No related tags found
No related merge requests found
......@@ -137,7 +137,8 @@ namespace armarx
auto terminated = TerminatedSkillStatusUpdate{
{.executionId = statusUpdate.executionId,
.parameters = statusUpdate.parameters,
.callbackInterface = statusUpdate.callbackInterface}};
.callbackInterface = statusUpdate.callbackInterface,
.result = statusUpdate.result}};
terminated.status = TerminatedSkillStatus::Aborted;
return terminated;
};
......@@ -151,7 +152,8 @@ namespace armarx
auto terminated = TerminatedSkillStatusUpdate{
{.executionId = statusUpdate.executionId,
.parameters = statusUpdate.parameters,
.callbackInterface = statusUpdate.callbackInterface}};
.callbackInterface = statusUpdate.callbackInterface,
.result = statusUpdate.result}};
terminated.status = TerminatedSkillStatus::Failed;
return terminated;
};
......
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