Changeset 14881 for stable

Timestamp:

04/21/17 07:12:31 (8 years ago)

Author:

gkronber

Message:

#2667: merged r14287 and r14297 from trunk to stable

Location:

stable

Files:

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

stable/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -141 +141 @@
 
     private void UpdateProgressValue() {
-      if (InvokeRequired) Invoke((Action)UpdateProgressValue);
-      else {
+      // prevent problems with object disposal and invoke as suggested by http://stackoverflow.com/a/18647091
+      if (!IsHandleCreated) return;
+      if (InvokeRequired) {
+        try {
+          Invoke((Action)UpdateProgressValue);
+        }
+        catch (InvalidOperationException) {
+          // swallow ObjectDisposedException 
+          // which might occur if the invoke call is executed after or while the control is disposing
+        }
+      } else {
         if (content != null) {
           double progressValue = content.ProgressValue;
@@ -149 +158 @@
           } else {
             progressBar.Style = ProgressBarStyle.Blocks;
-            progressBar.Value = (int)Math.Round(progressBar.Minimum + progressValue * (progressBar.Maximum - progressBar.Minimum));
+            progressBar.Value =
+              (int)Math.Round(progressBar.Minimum + progressValue * (progressBar.Maximum - progressBar.Minimum));
           }
         }