Changeset 8090

Timestamp:

06/22/12 16:35:32 (12 years ago)

Author:

jkarder

Message:

#1751: fixed event handling

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

@@ -365 +365 @@
       this.refreshAutomaticallyCheckBox.Text = "&Refresh automatically";
       this.refreshAutomaticallyCheckBox.UseVisualStyleBackColor = true;
-      this.refreshAutomaticallyCheckBox.Validated += new System.EventHandler(this.refreshAutomaticallyCheckBox_Validated);
+      this.refreshAutomaticallyCheckBox.CheckedChanged += new System.EventHandler(this.refreshAutomaticallyCheckBox_CheckedChanged);
       // 
       // infoGroupBox

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -416 +416 @@
     }
 
-    private void refreshAutomaticallyCheckBox_Validated(object sender, EventArgs e) {
+    private void refreshAutomaticallyCheckBox_CheckedChanged(object sender, EventArgs e) {
       if (Content != null) Content.RefreshAutomatically = refreshAutomaticallyCheckBox.Checked;
     }

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -519 +519 @@
     public event EventHandler HiveTasksChanged;
     protected virtual void OnHiveTasksChanged() {
-      if (jobResultPoller != null && jobResultPoller.IsPolling) {
-        jobResultPoller.Stop();
-        DeregisterResultPollingEvents();
-      }
+      StopResultPolling();
       if (this.HiveTasks != null && this.HiveTasks.Count > 0 && this.GetAllHiveTasks().All(x => x.Task.Id != Guid.Empty)) {
         if (IsFinished()) {
           this.ExecutionState = Core.ExecutionState.Stopped;
           this.RefreshAutomatically = false;
-        }
-
-        if (this.RefreshAutomatically) {
-          StartResultPolling();
+          if (jobResultPoller != null) DeregisterResultPollingEvents();
+        } else {
+          this.RefreshAutomatically = true;
         }
       }