Fixed rounding of liquid volumes CMYK and numeric controls.

Better support for TS-1800 waste replace process.

1 files changed, 6 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index d8a5ef6b8..1b229831f 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1418,8 +1418,11 @@ namespace Tango.Integration.Operation
 
         protected virtual void OnWasteReplacementRequired(string token, WasteReplaceRequest wasteReplaceRequest)
         {
-            _lastWasteReplaceRequestToken = token;
-            WasteReplacementRequired?.Invoke(this, new EventArgs());
+            if (_lastWasteReplaceRequestToken == null)
+            {
+                _lastWasteReplaceRequestToken = token;
+                WasteReplacementRequired?.Invoke(this, new EventArgs());
+            }
         }
 
         #endregion
@@ -4684,6 +4687,7 @@ namespace Tango.Integration.Operation
             if (_lastWasteReplaceRequestToken != null)
             {
                 await SendResponse<WasteReplaceResponse>(new WasteReplaceResponse() { Approved = approved }, _lastWasteReplaceRequestToken);
+                _lastWasteReplaceRequestToken = null;
             }
         }