Changeset 18025 for stable

Timestamp:

07/17/21 20:53:49 (3 years ago)

Author:

jkarder

Message:

#3018: merged r17221, r17222 and r17267 into stable

Location:

stable

Files:

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

stable/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -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>()
+          .Where(v => v.Content == Content && v != this);
+        if (!contentViews.Any())
+          Content.ClearHiveClient();
+
         Content = null;
       }