Ignore:
Timestamp:
03/20/14 13:38:16 (6 years ago)
Author:
abeham
Message:

#2167: merged to stable

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

    r9933 r10641  
    436436    /// </summary>
    437437    public void RemoveOperationProgressFromView(Control control, bool finishProgress = true) {
     438      if (InvokeRequired) {
     439        Invoke((Action<Control, bool>)RemoveOperationProgressFromView, control, finishProgress);
     440        return;
     441      }
     442
    438443      IProgress progress;
    439444      if (!viewProgressLookup.TryGetValue(control, out progress))
     
    550555      try {
    551556        ((IActionUserInterfaceItem)item.Tag).Execute();
    552       }
    553       catch (Exception ex) {
     557      } catch (Exception ex) {
    554558        ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
    555559      }
Note: See TracChangeset for help on using the changeset viewer.