erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-15 13:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge pull request #4921 from keymanapp/fix/windows/cherry-pick/4848-access-violation-closing-text-editor

Browse source 
fix(windows): access violation closing text editor 🍒
This commit is contained in:
Marc Durdin 2021-04-21 10:21:54 +10:00 • committed by GitHub
commit 87cbff4e4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
windows/src/desktop/kmshell/main/initprog.pas
View file

@ -480,7 +480,7 @@ begin
fmTextEditor:
begin // I2720
FMutex := TKeymanMutex.Create('KeymanTextEditor');
if FMutex.MutexOwned then OpenTextEditor(nil) else FocusTextEditor;
if FMutex.MutexOwned then OpenTextEditor else FocusTextEditor;
end;
fmBaseKeyboard: // I4169

20
windows/src/desktop/kmshell/startup/help/UfrmTextEditor.pas
View file

@ -181,7 +181,7 @@ type
public
end;
procedure OpenTextEditor(Owner: TComponent = nil); // I2260
procedure OpenTextEditor; // I2260
implementation
@ -223,20 +223,16 @@ resourcestring
const
GutterWid = 6;
procedure OpenTextEditor(Owner: TComponent = nil); // I2260
procedure OpenTextEditor; // I2260
var
frmTextEditor: TfrmTextEditor;
begin
if ApplicationRunning then
begin
frmTextEditor := TfrmTextEditor.Create(nil);
frmTextEditor.Show;
end
else
begin
UfrmWebContainer.CreateForm(TfrmTextEditor, frmTextEditor);
frmTextEditor.Visible := True;
end;
UfrmWebContainer.CreateForm(TfrmTextEditor, frmTextEditor);
frmTextEditor.Visible := True;
ApplicationRunning := True;
Application.Run;
ApplicationRunning := False;
FreeAndNil(frmTextEditor);
end;
{ TfrmTextEditor }