Free cookie consent management tool by TermsFeed Policy Generator

Changeset 15409


Ignore:
Timestamp:
10/06/17 15:23:57 (6 years ago)
Author:
pfleck
Message:

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

Location:
trunk/sources
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.cs

    r15408 r15409  
    5656      experimentTreeView.Enabled = Content != null;
    5757      runsViewHost.Enabled = Content != null;
     58      workersNumericUpDown.Enabled = Content != null && Content.ExecutionState != ExecutionState.Started;
    5859    }
    5960
  • trunk/sources/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

    r15408 r15409  
    2121
    2222using System;
    23 using System.Linq;
    2423using System.Threading;
    2524using HeuristicLab.Common;
     
    101100      base.Pause();
    102101      pausePending = true;
    103       CancellationTokenSource?.Cancel();
     102      if (CancellationTokenSource != null) CancellationTokenSource.Cancel();
    104103    }
    105104
     
    109108      base.Stop();
    110109      if (ExecutionState == ExecutionState.Paused) OnStopped();
    111       else CancellationTokenSource?.Cancel();
     110      else if (CancellationTokenSource != null) CancellationTokenSource.Cancel();
    112111    }
    113112
Note: See TracChangeset for help on using the changeset viewer.