From 52e9bb106f9e8f02e4a219a0b4a6931d55895912 Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Fri, 26 Jun 2026 07:52:48 -0700 Subject: [PATCH 1/2] Fix LT-22581: Crash clicking Values expansion button --- Src/Common/Controls/DetailControls/DataTree.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Src/Common/Controls/DetailControls/DataTree.cs b/Src/Common/Controls/DetailControls/DataTree.cs index f83c79bea9..f94ebc3cca 100644 --- a/Src/Common/Controls/DetailControls/DataTree.cs +++ b/Src/Common/Controls/DetailControls/DataTree.cs @@ -5302,6 +5302,7 @@ public DummyObjectSlice(int indent, XmlNode node, ArrayList path, ICmObject obj, m_indent = indent; m_node = node; m_path = path; + m_key = path.ToArray(); // This fixes LT-22581. m_obj = obj; m_flid = flid; m_ihvoMin = ihvoMin; From 3487ca8068d170f62eab1880c3c347fe2798b839 Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Tue, 30 Jun 2026 08:17:38 -0700 Subject: [PATCH 2/2] Change fix to one Jason recommended --- Src/Common/Controls/DetailControls/DataTree.cs | 1 - Src/Common/Controls/DetailControls/Slice.cs | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Src/Common/Controls/DetailControls/DataTree.cs b/Src/Common/Controls/DetailControls/DataTree.cs index f94ebc3cca..f83c79bea9 100644 --- a/Src/Common/Controls/DetailControls/DataTree.cs +++ b/Src/Common/Controls/DetailControls/DataTree.cs @@ -5302,7 +5302,6 @@ public DummyObjectSlice(int indent, XmlNode node, ArrayList path, ICmObject obj, m_indent = indent; m_node = node; m_path = path; - m_key = path.ToArray(); // This fixes LT-22581. m_obj = obj; m_flid = flid; m_ihvoMin = ihvoMin; diff --git a/Src/Common/Controls/DetailControls/Slice.cs b/Src/Common/Controls/DetailControls/Slice.cs index 6faaacb111..79bdb223e3 100644 --- a/Src/Common/Controls/DetailControls/Slice.cs +++ b/Src/Common/Controls/DetailControls/Slice.cs @@ -2938,6 +2938,10 @@ internal Slice GetSibling(Direction dir) private int GetMoveableDepth() { + if (Key == null) + { + return 0; + } int count = 0; foreach (object obj in Key) {