Changeset 6030 for trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization

Timestamp:

04/19/11 13:35:33 (14 years ago)

Author:

mkommend

Message:

#1488: Corrected locking of OperatorShapeInfo.

File:

• trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

@@ -47 +47 @@
       //mkommend: necessary because cloning a Bitmap is not threadsafe
       //see http://stackoverflow.com/questions/1851292/invalidoperationexception-object-is-currently-in-use-elsewhere for further information
-      if (original.icon != null) {
-        lock (lockObject) {
-          icon = (Bitmap)original.icon.Clone();
-        }
-      }
+      if (original.icon != null) icon = (Bitmap)original.icon.Clone();
 
       connectorNames = new List<string>(original.connectorNames);
@@ -57 +53 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new OperatorShapeInfo(this, cloner);
+      lock (lockObject) {
+        return new OperatorShapeInfo(this, cloner);
+      }
     }