1 files changed, 17 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
index 5b4cec488..014ca040a 100644
--- a/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
+++ b/Software/Visual_Studio/Tango.BL/LiquidVolume.cs
@@ -14,6 +14,7 @@ namespace Tango.BL
     public class LiquidVolume : ExtendedObject
     {
         public event Action VolumeChanged;
+        private static object _lock = new object();
 
         private BrushStop _brushStop;
         [JsonIgnore]
@@ -82,14 +83,25 @@ namespace Tango.BL
 
         public void Invalidate()
         {
-            if (BrushStop.LiquidVolumes != null)
+            lock (_lock)
             {
-                InvalidateSolo();
-
-                foreach (var liquidVolume in BrushStop.LiquidVolumes.ToList().Where(x => x != this))
+                try
                 {
-                    liquidVolume.InvalidateSolo();
+                    if (BrushStop.LiquidVolumes != null)
+                    {
+                        InvalidateSolo();
+
+                        foreach (var liquidVolume in BrushStop.LiquidVolumes.ToList().Where(x => x != this))
+                        {
+                            liquidVolume.InvalidateSolo();
+                        }
+                    }
                 }
+                catch (Exception ex)
+                {
+
+                    throw;
+                } 
             }
         }