ISSUE 802

paolosalvatori · Dec 2, 2024 · d537dee · d537dee
1 parent f81be16
commit d537dee
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/ServiceBusExplorer/Forms/MainForm.cs b/src/ServiceBusExplorer/Forms/MainForm.cs
@@ -1817,6 +1817,7 @@ private void RefreshIndividualSubscription(SubscriptionDescription subscriptionD
         private void RefreshIndividualTopic(TreeNode selectedNode)
         {
             var wasTopicNodeExpanded = selectedNode.IsExpanded;
+            var wasSubscriptionsNodeExpaned = false;
 
             var topicDescription = selectedNode.Tag as TopicDescription;
 
@@ -1829,6 +1830,13 @@ private void RefreshIndividualTopic(TreeNode selectedNode)
                 return;
             }
 
+            //record the original subscriptions node is expanded
+            var originalSubscriptionsNode = selectedNode.Nodes.Find(SubscriptionEntities, false).First();
+            if (originalSubscriptionsNode != null)
+            {
+                wasSubscriptionsNodeExpaned = originalSubscriptionsNode.IsExpanded;
+            }
+
             selectedNode.Nodes.Clear();
             var subscriptionsNode = selectedNode.Nodes.Add(SubscriptionEntities, SubscriptionEntities, SubscriptionListIconIndex, SubscriptionListIconIndex);
             subscriptionsNode.Text = string.IsNullOrWhiteSpace(FilterExpressionHelper.SubscriptionFilterExpression) ? SubscriptionEntities : FilteredSubscriptionEntities;
@@ -1852,6 +1860,10 @@ private void RefreshIndividualTopic(TreeNode selectedNode)
 
             if (wasTopicNodeExpanded)
                 selectedNode.Expand();
+            if (wasSubscriptionsNodeExpaned == true)
+            {
+                subscriptionsNode.Expand();
+            }
         }
 
         private void createEntity_Click(object sender, EventArgs e)