Skip to content

Fix LT-22401: Crash when Is Translation Column is added #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtmaxwell3 merged 1 commit into from
Feb 6, 2026
Merged

Fix LT-22401: Crash when Is Translation Column is added #669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Src/Common/Controls/XMLViews/XmlViewsUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ static void CollectBrowseItems(int hvo, XmlNode node, ArrayList collector,
case "layout":
// These are grouping nodes. In general this terminates things. However, if there is only
// one thing embedded apart from comments and properties, we can proceed.
XmlNode mainChild = FindMainChild(node, hvo, cache);
XmlNode mainChild = FindMainChild(node, hvo, cache, sda);
if (mainChild == null)
{
// no single non-trivial child, keep our current object
Expand All @@ -483,7 +483,7 @@ static void CollectBrowseItems(int hvo, XmlNode node, ArrayList collector,
/// Returns null if there is more than one child.
/// </summary>
/// ------------------------------------------------------------------------------------
static private XmlNode FindMainChild(XmlNode node, int hvo, LcmCache cache)
static private XmlNode FindMainChild(XmlNode node, int hvo, LcmCache cache, ISilDataAccess sda)
{
XmlNode mainChild = null;
int count = 0;
Expand All @@ -493,21 +493,21 @@ static private XmlNode FindMainChild(XmlNode node, int hvo, LcmCache cache)
continue;
if (cache != null && child.Name == "if")
{
if (!XmlVc.ConditionPasses(child, hvo, cache))
if (!XmlVc.ConditionPasses(child, hvo, cache, sda, null))
{
// Act as if the node is not present.
continue;
}
mainChild = FindMainChild(child, hvo, cache);
mainChild = FindMainChild(child, hvo, cache, sda);
}
else if (cache != null && child.Name == "ifnot")
{
if (XmlVc.ConditionPasses(child, hvo, cache))
if (XmlVc.ConditionPasses(child, hvo, cache, sda, null))
{
// Act as if the node is not present.
continue;
}
mainChild = FindMainChild(child, hvo, cache);
mainChild = FindMainChild(child, hvo, cache, sda);
}
else
{
Expand Down Expand Up @@ -1127,7 +1127,7 @@ static NodeDisplayCommand GetDisplayCommandForColumn1(IManyOnePathSortItem bvi,
case "concpara":
case "innerpile":
{
XmlNode mainChild = FindMainChild(node,hvo, cache);
XmlNode mainChild = FindMainChild(node,hvo, cache, sda);
if (mainChild == null)
return new NodeDisplayCommand(node); // can't usefully go further.
if (collectOuterStructParts != null)
Expand Down Expand Up @@ -1155,7 +1155,7 @@ static NodeDisplayCommand GetDisplayCommandForColumn1(IManyOnePathSortItem bvi,
// Also, expecially in the case of 'layout', they may result from unification, and be meaningless
// except for their children; in any case, the children are all we want to process.
// This is the main reason we return a command, not just a node: this case has to return the subclass.
XmlNode mainChild = FindMainChild(node, hvo, cache);
XmlNode mainChild = FindMainChild(node, hvo, cache, sda);
if (mainChild == null)
return new NodeChildrenDisplayCommand(node); // can't usefully go further.
return GetDisplayCommandForColumn1(bvi, mainChild, cache, mdc, sda, layouts, depth, out hvo, collectOuterStructParts);
Expand All @@ -1168,7 +1168,7 @@ static NodeDisplayCommand GetDisplayCommandForColumn1(IManyOnePathSortItem bvi,
// Also, expecially in the case of 'layout', they may result from unification, and be meaningless
// except for their children; in any case, the children are all we want to process.
// This is the main reason we return a command, not just a node: this case has to return the subclass.
XmlNode mainChild = FindMainChild(node, hvo, cache);
XmlNode mainChild = FindMainChild(node, hvo, cache, sda);
if (mainChild == null)
return new NodeChildrenDisplayCommand(node); // can't usefully go further.
return GetDisplayCommandForColumn1(bvi, mainChild, cache, mdc, sda, layouts, depth, out hvo, collectOuterStructParts);
Expand Down
Loading