Skip to content

Commit 6a731d4

Browse files
Update TraceChangeManager.cs
1 parent 08cb1ec commit 6a731d4

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

AudioCuesheetEditor/Services/UI/TraceChangeManager.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,11 @@ public bool BulkEdit
217217
public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
218218
{
219219
var edit = undoStack.FirstOrDefault(targetEdit);
220-
if (edit != null)
220+
if ((edit != null) && (undoStack.Count > 0))
221221
{
222-
if (undoStack.Count > 0)
223-
{
224-
var lastEdits = undoStack.Pop();
225-
edit.Changes.AddRange(lastEdits.Changes);
226-
UndoDone?.Invoke(this, EventArgs.Empty);
227-
}
222+
var lastEdits = undoStack.Pop();
223+
edit.Changes.AddRange(lastEdits.Changes);
224+
UndoDone?.Invoke(this, EventArgs.Empty);
228225
}
229226
}
230227

0 commit comments

Comments
 (0)