Changeset 15281 for branches/Async/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

Timestamp:

07/23/17 11:17:18 (7 years ago)

Author:

abeham

Message:

#2258: merged r14001:15280 from trunk into branch

Location:

branches/Async

Files:

• . (modified) (2 props)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs (modified) (3 diffs)

branches/Async

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/Async/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ProgressView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -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));
           }
         }

@@ -24 +24 @@
 protoc.exe
 obj
+.vs