From dc13206fb02cf724b0f50425a74fa900ebf794d6 Mon Sep 17 00:00:00 2001 From: John Maxwell Date: Tue, 26 May 2026 09:18:00 -0700 Subject: [PATCH] Fix LT-22530: Error message when cutting in Concordance view --- Src/Common/SimpleRootSite/EditingHelper.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Src/Common/SimpleRootSite/EditingHelper.cs b/Src/Common/SimpleRootSite/EditingHelper.cs index 7a22205912..56f14d304f 100644 --- a/Src/Common/SimpleRootSite/EditingHelper.cs +++ b/Src/Common/SimpleRootSite/EditingHelper.cs @@ -3257,9 +3257,17 @@ internal void CopyTssToClipboard(ITsString tss) /// protected virtual void DeleteSelectionTask(string undoLabel, string redoLabel) { - Callbacks.EditedRootBox.DataAccess.GetActionHandler().BeginUndoTask(undoLabel, redoLabel); - DeleteSelection(); - Callbacks.EditedRootBox.DataAccess.GetActionHandler().EndUndoTask(); + IActionHandler actionHandler = Callbacks.EditedRootBox.DataAccess.GetActionHandler(); + if (actionHandler != null) + { + actionHandler.BeginUndoTask(undoLabel, redoLabel); + DeleteSelection(); + actionHandler.EndUndoTask(); + } + else + { + DeleteSelection(); + } } /// -----------------------------------------------------------------------------------