Skip to content

Commit 1b9728c

Browse files
jtmaxwell3jasonleenaylor
authored andcommitted
Fix LT-22002: Crash occurred changing same name style (#367)
1 parent bff6237 commit 1b9728c

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

Src/FwCoreDlgs/FwStylesDlg.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,15 @@ private void m_btnOk_Click(object sender, EventArgs e)
863863

864864
try
865865
{
866+
// Preprocess deletions (For LT-22002).
867+
foreach (string deleted in m_deletedStyleNames)
868+
{
869+
if (m_styleTable.ContainsKey(deleted))
870+
m_styleTable.Remove(deleted);
871+
}
872+
if (m_deletedStyleNames.Contains(m_styleListHelper.SelectedStyleName))
873+
m_deletedStyleNames.Remove(m_styleListHelper.SelectedStyleName);
874+
866875
// Check to make sure new styles are not going to result in duplicates
867876
// in the database
868877
m_styleSheet.CheckForDuplicates(m_styleTable);
@@ -1223,6 +1232,9 @@ private void DeleteAndRenameStylesInDB()
12231232
foreach (var kvp in m_renamedStyles)
12241233
replaceSpec[kvp.Value] = kvp.Key;
12251234
StringServices.ReplaceStyles(m_cache, replaceSpec);
1235+
// Don't process again.
1236+
m_deletedStyleNames.Clear();
1237+
m_renamedStyles.Clear();
12261238

12271239
m_changeType |= StyleChangeType.RenOrDel;
12281240
}

0 commit comments

Comments
 (0)