Changeset 10641 for stable

Timestamp:

03/20/14 13:38:16 (11 years ago)

Author:

abeham

Message:

#2167: merged to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (2 diffs)

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

@@ -436 +436 @@
     /// </summary>
     public void RemoveOperationProgressFromView(Control control, bool finishProgress = true) {
+      if (InvokeRequired) {
+        Invoke((Action<Control, bool>)RemoveOperationProgressFromView, control, finishProgress);
+        return;
+      }
+
       IProgress progress;
       if (!viewProgressLookup.TryGetValue(control, out progress))
@@ -550 +555 @@
       try {
         ((IActionUserInterfaceItem)item.Tag).Execute();
-      }
-      catch (Exception ex) {
+      } catch (Exception ex) {
         ErrorHandling.ShowErrorDialog((Control)MainFormManager.MainForm, ex);
       }