Changeset 9905 for trunk/sources

Timestamp:

08/23/13 11:21:02 (11 years ago)

Author:

mkommend

Message:

#1042: Added invoke required checks to the progress view display.

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -354 +354 @@
     /// </summary>
     public IProgress AddOperationProgressToContent(IContent content, string progressMessage, bool addToObjectGraphObjects = true) {
+      if (InvokeRequired) {
+        IProgress result = (IProgress)Invoke((Func<IContent, string, bool, IProgress>)AddOperationProgressToContent, content, progressMessage, addToObjectGraphObjects);
+        return result;
+      }
       if (contentProgressLookup.ContainsKey(content))
         throw new ArgumentException("A progress is already registered for the specified content.", "content");
@@ -386 +390 @@
 
     public void AddOperationProgressToView(Control control, IProgress progress) {
+      if (InvokeRequired) {
+        Invoke((Action<Control, IProgress>)AddOperationProgressToView, control, progress);
+        return;
+      }
       if (control == null) throw new ArgumentNullException("control", "The view must not be null.");
       if (progress == null) throw new ArgumentNullException("progress", "The progress must not be null.");
@@ -406 +414 @@
     /// </summary>
     public void RemoveOperationProgressFromContent(IContent content, bool finishProgress = true) {
+      if (InvokeRequired) {
+        Invoke((Action<IContent, bool>)RemoveOperationProgressFromContent, content, finishProgress);
+        return;
+      }
+
       IProgress progress;
       if (!contentProgressLookup.TryGetValue(content, out progress))
@@ -416 +429 @@
       }
       contentProgressLookup.Remove(content);
+
     }