Changeset 17226 for branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

Timestamp:

08/29/19 15:57:35 (5 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into problem refactoring branch.

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -143 +143 @@
     protected override void OnClosed(FormClosedEventArgs e) {
       if (Content != null && Content.Jobs != null) {
-        Content.ClearHiveClient();
+        // clear hive client only if it is not displayed by any other content view (i.e. job manager)
+        var contentViews = MainFormManager.MainForm.Views.OfType<IContentView>();
+        if (contentViews.All(x => x.Content != Content || x == this))
+          Content.ClearHiveClient();
+
         Content = null;
       }