aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Emulations
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-04-22 19:50:30 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-04-22 19:50:30 +0300
commitffbda2b8be71d4942e0d4af2f53b5bde357c72e2 (patch)
tree6656196be6ecaccaed9b39aaf1a75619aeec194b /Software/Visual_Studio/Tango.Emulations
parentc2945492e7c4d168c36b632d1f28dd8ca569b5ac (diff)
parent0a63ef17afb9afe60e4ea98cff86dda7fbdad1f6 (diff)
downloadTango-ffbda2b8be71d4942e0d4af2f53b5bde357c72e2.tar.gz
Tango-ffbda2b8be71d4942e0d4af2f53b5bde357c72e2.zip
MERGE!
Diffstat (limited to 'Software/Visual_Studio/Tango.Emulations')
-rw-r--r--Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 7f99c8161..8d1aefe54 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -608,7 +608,7 @@ namespace Tango.Emulations.Emulators
Transporter.SendResponse<ResumeCurrentJobResponse>(new ResumeCurrentJobResponse()
{
- }, request.Container.Token, false, ErrorCode.ContinuousResponseAborted);
+ }, _current_job_resume_token, false, ErrorCode.ContinuousResponseAborted);
}
}
else
@@ -633,7 +633,7 @@ namespace Tango.Emulations.Emulators
Progress = job.Length + job.ProcessParameters.DryerBufferLength,
}
- }, request.Container.Token, !_cancelJob);
+ }, _current_job_resume_token, !_cancelJob);
}
}
});