Some more optimizations to the DataTree state.

Author: Neverbirth

External/Plugins/FlashDebugger/Controls/DataTreeControl.cs

@@ -478,19 +478,20 @@ public void SaveState()
             if (state == null) state = new DataTreeState();
             state.Selected = _tree.SelectedNode == null ? null : _model.GetFullPath(_tree.SelectedNode.Tag as Node);
             state.Expanded.Clear();
-            SaveExpanded(Nodes);
+            if (Nodes != null && Nodes.Count > 0)
+                SaveExpanded(Nodes);
             SaveScrollState();
         }
 
         private void SaveExpanded(Collection<Node> nodes)
         {
-            if (nodes == null) return;
             foreach (Node node in nodes)
             {
-                if (Tree.FindNode(_model.GetPath(node)).IsExpanded)
+                if (!node.IsLeaf && Tree.FindNode(_model.GetPath(node)).IsExpanded)
                 {
                     state.Expanded.Add(_model.GetFullPath(node));
-                    SaveExpanded(node.Nodes);
+                    if (node.Nodes.Count > 0)
+                        SaveExpanded(node.Nodes);
                 }
             }
         }
@@ -511,21 +512,22 @@ private void SaveScrollState()
         public void RestoreState()
         {
             if (state == null) return;
-            RestoreExpanded(Nodes);
+            if (state.Expanded != null && state.Expanded.Count > 0)
+                RestoreExpanded(Nodes);
             if (state.Selected != null)
                 _tree.SelectedNode = _tree.FindNodeByTag(_model.FindNode(state.Selected));
             RestoreScrollState();
         }
 
         private void RestoreExpanded(Collection<Node> nodes)
         {
-            if (nodes == null) return;
             foreach (Node node in nodes)
             {
                 if (!node.IsLeaf && state.Expanded.Contains(_model.GetFullPath(node)))
                 {
                     Tree.FindNode(_model.GetPath(node)).Expand();
-                    RestoreExpanded(node.Nodes);
+                    if (node.Nodes.Count > 0)
+                        RestoreExpanded(node.Nodes);
                 }
             }
         }