Skip to content

Commit

Permalink
Preserve sense examples, subsenses importing from The Combine (#253)
Browse files Browse the repository at this point in the history
  • Loading branch information
imnasnainaec authored Jan 23, 2025
1 parent e94c063 commit 985bbc7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Src/LexText/LexTextControls/LiftMerger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4003,7 +4003,7 @@ private void MergeIntoExistingSense(ILexSense ls, CmLiftSense sense)
setUsed.Add(lsSub.Hvo);
}
// If we're keeping only the imported data, delete any unused subsense.
if (m_msImport == MergeStyle.MsKeepOnlyNew || m_msImport == MergeStyle.MsTheCombine)
if (m_msImport == MergeStyle.MsKeepOnlyNew)
{
foreach (int hvo in ls.SensesOS.ToHvoArray())
{
Expand Down Expand Up @@ -4063,7 +4063,7 @@ private void MergeSenseExamples(ILexSense ls, CmLiftSense sense)
setUsed.Add(les.Hvo);
}
// If we're keeping only the imported data, delete any unused example.
if (m_msImport == MergeStyle.MsKeepOnlyNew || m_msImport == MergeStyle.MsTheCombine)
if (m_msImport == MergeStyle.MsKeepOnlyNew)
{
foreach (int hvo in ls.ExamplesOS.ToHvoArray())
{
Expand Down Expand Up @@ -4297,7 +4297,7 @@ private void MergeExampleTranslations(ILexExampleSentence les, CmLiftExample exp
setUsed.Add(ct.Hvo);
}
// If we're keeping only the imported data, erase any unused existing data first.
if (m_msImport == MergeStyle.MsKeepOnlyNew || m_msImport == MergeStyle.MsTheCombine)
if (m_msImport == MergeStyle.MsKeepOnlyNew)
{
foreach (int hvo in les.TranslationsOC.ToHvoArray())
{
Expand Down

0 comments on commit 985bbc7

Please sign in to comment.