DB CHANGE from previous commit.

Implemented multiple job stops until success.

Related Work Items: #2412

1 files changed, 11 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 0c06448e1..6d0bdbfc4 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -82,6 +82,7 @@ namespace Tango.Emulations.Emulators
         private bool _isThreadLoadingStarted;
         private String _threadLoadingToken;
         private DateTime _connectionTime;
+        private int _jobAbortCounter;
 
         #region Properties
 
@@ -851,8 +852,16 @@ namespace Tango.Emulations.Emulators
 
         private void HandleAbortJobRequest(TangoMessage<AbortJobRequest> request)
         {
-            _cancelJob = true;
-            Transporter.SendResponse<AbortJobResponse>(new AbortJobResponse(), request.Container.Token);
+            if (_jobAbortCounter == 1)
+            {
+                _cancelJob = true;
+                Transporter.SendResponse<AbortJobResponse>(new AbortJobResponse(), request.Container.Token);
+                _jobAbortCounter = 0;
+            }
+            else
+            {
+                _jobAbortCounter++;
+            }
         }
 
         private void HandleMotorJoggingRequest(TangoMessage<MotorJoggingRequest> request)