Changeset 13199 for stable/HeuristicLab.Optimization/3.3/RunCollection.cs

Timestamp:

11/16/15 21:39:15 (8 years ago)

Author:

abeham

Message:

#2441: merged r13181, r13198 to stable

File:

• stable/HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (4 diffs)

stable/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -483 +483 @@
     #region Filtering
     private void UpdateFiltering(bool reset) {
-      var oldUpateRuns = UpdateOfRunsInProgress;
-      UpdateOfRunsInProgress = true;
       if (reset)
         list.ForEach(r => r.Visible = true);
       foreach (IRunCollectionConstraint constraint in this.constraints)
         constraint.Check();
-      UpdateOfRunsInProgress = oldUpateRuns;
     }
 
@@ -539 +536 @@
     protected virtual void Constraint_ConstraintOperationChanged(object sender, EventArgs e) {
       IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
-      if (constraint.Active)
-        this.UpdateFiltering(true);
+      if (constraint.Active) {
+        var oldUpdateRuns = UpdateOfRunsInProgress;
+        try {
+          UpdateOfRunsInProgress = true;
+          UpdateFiltering(true);
+        } finally { UpdateOfRunsInProgress = oldUpdateRuns; }
+      }
     }
     protected virtual void Constraint_ConstraintDataChanged(object sender, EventArgs e) {
       IRunCollectionConstraint constraint = (IRunCollectionConstraint)sender;
-      if (constraint.Active)
-        this.UpdateFiltering(true);
+      if (constraint.Active) {
+        var oldUpdateRuns = UpdateOfRunsInProgress;
+        try {
+          UpdateOfRunsInProgress = true;
+          UpdateFiltering(true);
+        } finally { UpdateOfRunsInProgress = oldUpdateRuns; }
+      }
     }
     #endregion
@@ -551 +558 @@
     #region Modification
     public void Modify() {
-      var oldUpateRuns = UpdateOfRunsInProgress;
-      UpdateOfRunsInProgress = true;
       var runs = this.ToList();
       var selectedRuns = runs.Where(r => r.Visible).ToList();
@@ -566 +571 @@
         }
       }
-      UpdateOfRunsInProgress = oldUpateRuns;
     }