1 files changed, 10 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs
index b75fe7e03..d37fe1aaa 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/ColorCalibrationViewVM.cs
@@ -180,6 +180,16 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         public void Save()
         {
+            //Remove cats with deleted RMLS. (Can only happen when creating new machine from prototype)
+            foreach (var cat in Machine.Cats.ToList())
+            {
+                if (!Rmls.Any(x => x.Guid == cat.RmlGuid))
+                {
+                    Machine.Cats.Remove(cat);
+                    _dbContext.Cats.Remove(cat);
+                }
+            }
+
             foreach (var calDataVM in ColorConversionViewVM.LiquidsCalibrationData)
             {
                 var cat = calDataVM.IdsPack.LiquidType.Cats.FirstOrDefault(x => x.Machine == Machine && x.Rml == SelectedRML);