Implemented timeout for continuous response. (at least one response).

1 files changed, 13 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
index fd20f9f5d..1ae4c078a 100644
--- a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
@@ -133,8 +133,15 @@ namespace Tango.Integration.Operators
 
             handler = new JobHandler(async () => 
             {
-                var result = await SendRequest<AbortJobRequest, AbortJobResponse>(new AbortJobRequest(), TimeSpan.FromSeconds(10));
-                handler.RaiseCanceled();
+                try
+                {
+                    var result = await SendRequest<AbortJobRequest, AbortJobResponse>(new AbortJobRequest());
+                    handler.RaiseCanceled();
+                }
+                catch (Exception)
+                {
+                    //TODO: What to do in case job failed to cancel ??
+                }
             });
 
             SendContinuousRequest<JobRequest, JobResponse>(request).Subscribe((response) => 
@@ -142,7 +149,10 @@ namespace Tango.Integration.Operators
                 handler.RaiseStatusReceived(response.Message.Status);
             },(ex) => 
             {
-                handler.RaiseFailed(ex);
+                if (!handler.IsCanceled)
+                {
+                    handler.RaiseFailed(ex);
+                }
             },() => 
             {
                 handler.RaiseCompleted();