Changeset 15409 for trunk/sources

Timestamp:

10/06/17 15:23:57 (7 years ago)

Author:

pfleck

Message:

#2822 removed C# 6 feature and fixed enabled-state.

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/ExperimentView.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.cs

@@ -56 +56 @@
       experimentTreeView.Enabled = Content != null;
       runsViewHost.Enabled = Content != null;
+      workersNumericUpDown.Enabled = Content != null && Content.ExecutionState != ExecutionState.Started;
     }
 

trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Threading;
 using HeuristicLab.Common;
@@ -101 +100 @@
       base.Pause();
       pausePending = true;
-      CancellationTokenSource?.Cancel();
+      if (CancellationTokenSource != null) CancellationTokenSource.Cancel();
     }
 
@@ -109 +108 @@
       base.Stop();
       if (ExecutionState == ExecutionState.Paused) OnStopped();
-      else CancellationTokenSource?.Cancel();
+      else if (CancellationTokenSource != null) CancellationTokenSource.Cancel();
     }