Changeset 13767 for branches/PerformanceComparison

Timestamp:

04/15/16 09:37:26 (9 years ago)

Author:

abeham

Message:

#2457: fixed cross-thread exception

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3

Files:

• Menu/0_Config/30_DownloadFromOkbMenuItem.cs (modified) (3 diffs)
• Toolbar/DownloadFromOKBToolbarItem.cs (modified) (3 diffs)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Menu/0_Config/30_DownloadFromOkbMenuItem.cs

@@ -56 +56 @@
     protected override void OnToolStripItemSet(EventArgs e) {
       base.OnToolStripItemSet(e);
-      ToolStripItem.Enabled = MainForm.ExpertSystem.Problem.ProblemId != -1;
+      SetToolStripItemEnabled(MainForm.ExpertSystem.Problem.ProblemId != -1);
       MainForm.ExpertSystem.Problem.ProblemChanged += OnProblemChanged;
       MainForm.ExpertSystem.DownloadStarted += OnDownloadStarted;
@@ -62 +62 @@
 
     private void OnProblemChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainForm.ExpertSystem.Problem.ProblemId != -1;
+      SetToolStripItemEnabled(MainForm.ExpertSystem.Problem.ProblemId != -1);
     }
 
     private void OnDownloadStarted(object sender, EventArgs<IProgress> e) {
-      ToolStripItem.Enabled = false;
+      SetToolStripItemEnabled(false);
       e.Value.ProgressStateChanged += DownloadProgressOnStateChanged;
     }
@@ -73 +73 @@
       var progress = (IProgress)sender;
       if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Canceled) {
-        ToolStripItem.Enabled = true;
+        SetToolStripItemEnabled(true);
         progress.ProgressStateChanged -= DownloadProgressOnStateChanged;
       }
     }
+
+    private void SetToolStripItemEnabled(bool state) {
+      if (ToolStripItem.Owner != null && ToolStripItem.Owner.InvokeRequired) { ToolStripItem.Owner.Invoke((Action<bool>)SetToolStripItemEnabled, state); return; }
+      ToolStripItem.Enabled = state;
+    }
   }
 }

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/Toolbar/DownloadFromOKBToolbarItem.cs

@@ -50 +50 @@
     protected override void OnToolStripItemSet(EventArgs e) {
       base.OnToolStripItemSet(e);
-      ToolStripItem.Enabled = MainForm.ExpertSystem.Problem.ProblemId != -1;
+      SetToolStripItemEnabled(MainForm.ExpertSystem.Problem.ProblemId != -1);
       MainForm.ExpertSystem.Problem.ProblemChanged += OnProblemChanged;
       MainForm.ExpertSystem.DownloadStarted += OnDownloadStarted;
@@ -56 +56 @@
 
     private void OnProblemChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainForm.ExpertSystem.Problem.ProblemId != -1;
+      SetToolStripItemEnabled(MainForm.ExpertSystem.Problem.ProblemId != -1);
     }
 
     private void OnDownloadStarted(object sender, EventArgs<IProgress> e) {
-      ToolStripItem.Enabled = false;
+      SetToolStripItemEnabled(false);
       e.Value.ProgressStateChanged += DownloadProgressOnStateChanged;
     }
@@ -67 +67 @@
       var progress = (IProgress)sender;
       if (progress.ProgressState == ProgressState.Finished || progress.ProgressState == ProgressState.Canceled) {
-        ToolStripItem.Enabled = true;
+        SetToolStripItemEnabled(true);
         progress.ProgressStateChanged -= DownloadProgressOnStateChanged;
       }
     }
+
+    private void SetToolStripItemEnabled(bool state) {
+      if (ToolStripItem.Owner != null && ToolStripItem.Owner.InvokeRequired) { ToolStripItem.Owner.Invoke((Action<bool>)SetToolStripItemEnabled, state); return; }
+      ToolStripItem.Enabled = state;
+    }
   }
 }