Skip to content

Fix LT-22352: Crash after clicking Merge Sense in popup window #615

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
Jan 12, 2026
Merged

Fix LT-22352: Crash after clicking Merge Sense in popup window #615

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
14 changes: 12 additions & 2 deletions Src/xWorks/DTMenuHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,8 +1010,18 @@ public bool OnDataTreeMerge(object cmd)
{
Slice current = m_dataEntryForm.CurrentSlice;
Debug.Assert(current != null, "No slice was current");
if (current != null)
current.HandleMergeCommand(true);
if (current == null)
{
return false;
}
Command command = cmd as Command;
string className = command?.ConfigurationNode?.FirstChild?.Attributes["className"]?.Value;
if (className == "LexSense" && current.Object?.ClassName != "LexSense")
{
// Lexicon Edit Popup must match the class (LT-22352).
return false;
}
current.HandleMergeCommand(true);
return true; //we handled this.
}

Expand Down
Loading