diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas index 287ee587d..df37fe027 100644 --- a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas +++ b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas @@ -2297,6 +2297,8 @@ procedure TsCellEdit.EditingDone; var s: String; begin + inherited; + if (Worksheet = nil) then exit;