opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #1936: Attempt to fix EAbstractError when closing text editor

Browse Source
This commit is contained in:
Ansgar Becker
2024-04-29 16:04:34 +02:00
parent 604047f8d6
commit 358bee628c
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/grideditlinks.pas
View File

@ -1147,10 +1147,14 @@ end;
destructor TInplaceEditorLink.Destroy;
begin
if Assigned(FTextEditor) then
FTextEditor.Release;
if not ((csDestroying in FPanel.ComponentState) or (csCreating in FPanel.ControlState)) then
if Assigned(FTextEditor) then begin
FTextEditor.Free;
end;
if not ((csDestroying in FPanel.ComponentState) or (csCreating in FPanel.ControlState)) then begin
FEdit.Free;
FButton.Free;
FPanel.Free;
end;
inherited;
end;
@ -1173,8 +1177,9 @@ function TInplaceEditorLink.CancelEdit: Boolean;
begin
Result := inherited CancelEdit;
if Result then begin
if Assigned(FTextEditor) then
if Assigned(FTextEditor) then begin
FTextEditor.Close;
end;
end;
end;
@ -1184,14 +1189,8 @@ var
begin
Result := not FStopping;
if FStopping then Exit;
if Assigned(FTextEditor) then begin
NewText := FTextEditor.GetText;
FModified := FTextEditor.Modified;
FTextEditor.Close;
end else begin
NewText := FEdit.Text;
FModified := FEdit.Modified;
end;
NewText := FEdit.Text;
FModified := NewText <> FCellText;
Result := EndEditHelper(NewText);
end;
@ -1218,7 +1217,13 @@ begin
FTextEditor.SetMaxLength(FMaxLength);
FTextEditor.TableColumn := FTableColumn;
FTextEditor.MemoText.ReadOnly := not FAllowEdit;
FTextEditor.ShowModal;
if FTextEditor.ShowModal = mrOk then begin
FEdit.Text := FTextEditor.GetText;
DoEndEdit(Sender);
end
else begin
DoCancelEdit(Sender);
end;
end;
function TInplaceEditorLink.PrepareEdit(Tree: TBaseVirtualTree;