Use correct invocation of instruction results

VERSION

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

src/Moryx.ControlSystem/VisualInstructions/EnumInstructionResult.cs

@@ -49,6 +49,20 @@
             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

@@ -62,7 +62,7 @@
             {
                 Title = title,
                 Instructions = parameter.Instructions,
                 PossibleResults = results
             }, callback);
         }
 
@@ -80,7 +80,7 @@
                 result =>
                 {
                     if (result.SelectedResult?.Key == null)
                         callback(EnumInstructionResult.ResultToGenericEnumValue<T>(result.Result));
                     else
                         callback(EnumInstructionResult.ResultToGenericEnumValue<T>(result.SelectedResult));
                 });
@@ -96,7 +96,7 @@
             {
                 Title = title,
                 Instructions = instructions,
                 PossibleResults = results,
                 Results = results.Select(r => new InstructionResult { Key = r, DisplayValue = r }).ToArray()
             }, callback);
         }
@@ -163,14 +163,15 @@
 
             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)