Merge remote-tracking branch 'origin/dev'

VERSION

@@ -1 +1 @@
-8.2.2
+8.2.3

src/Moryx.ControlSystem/VisualInstructions/EnumInstructionResult.cs

@@ -49,6 +49,20 @@ public static int ResultToEnumValue(Type resultEnum, InstructionResult result)
             return int.Parse(result.Key);
         }
 
+        /// <summary>
+        /// Extract result from response object depending on what values is present
+        /// </summary>
+        public static int ResultToEnumValue(Type resultEnum, ActiveInstructionResponse response)
+        {
+            if(response.SelectedResult != null)
+                return ResultToEnumValue(resultEnum, response.SelectedResult);
+
+            if (response.Result != null)
+                return ResultToEnumValue(resultEnum, response.Result);
+
+            throw new ArgumentException("No result found on response", nameof(response));
+        }
+
         /// <summary>
         /// Convert string result to typed enum
         /// </summary>

src/Moryx.ControlSystem/VisualInstructions/VisualInstructorExtensions.cs

@@ -163,14 +163,15 @@ private static long ExecuteWithEnum(this IVisualInstructor instructor, string ti
 
             var results = EnumInstructionResult.PossibleResults(attr.ResultEnum);
             var resultObjects = EnumInstructionResult.PossibleInstructionResults(attr.ResultEnum);
+
             return instructor.Execute(new ActiveInstruction
             {
                 Title = title,
                 Instructions = parameters,
                 PossibleResults = results,
                 Results = resultObjects.ToArray(),
                 Inputs = inputs
-            }, instructionResponse => callback(EnumInstructionResult.ResultToEnumValue(attr.ResultEnum, instructionResponse.Result), instructionResponse.Inputs, activityStart));
+            }, instructionResponse => callback(EnumInstructionResult.ResultToEnumValue(attr.ResultEnum, instructionResponse), instructionResponse.Inputs, activityStart));
         }
 
         private static VisualInstruction[] GetInstructions(ActivityStart activity)