Changeset 15409
- Timestamp:
- 10/06/17 15:23:57 (7 years ago)
- Location:
- trunk/sources
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.cs
r15408 r15409 56 56 experimentTreeView.Enabled = Content != null; 57 57 runsViewHost.Enabled = Content != null; 58 workersNumericUpDown.Enabled = Content != null && Content.ExecutionState != ExecutionState.Started; 58 59 } 59 60 -
trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs
r15408 r15409 21 21 22 22 using System; 23 using System.Linq;24 23 using System.Threading; 25 24 using HeuristicLab.Common; … … 101 100 base.Pause(); 102 101 pausePending = true; 103 CancellationTokenSource?.Cancel();102 if (CancellationTokenSource != null) CancellationTokenSource.Cancel(); 104 103 } 105 104 … … 109 108 base.Stop(); 110 109 if (ExecutionState == ExecutionState.Paused) OnStopped(); 111 else CancellationTokenSource?.Cancel();110 else if (CancellationTokenSource != null) CancellationTokenSource.Cancel(); 112 111 } 113 112
Note: See TracChangeset
for help on using the changeset viewer.