erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-24 08:37:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #4940 from keymanapp/fix/windows/4939-prevent-crash-during-upgrade

Browse source 
fix(windows): avoid error if keyman32.dll renamed
This commit is contained in:
Marc Durdin 2021-04-21 16:47:09 +10:00 • committed by GitHub
commit 0d80fa5efa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
windows/src/engine/kmcomapi/com/system/keymancontrol.pas
View file

@ -554,9 +554,10 @@ begin
{$IFDEF WIN64}
Error(Cardinal(E_NOTIMPL));
{$ELSE}
LoadKeyman32;
if not FKeyman_UnregisterControllerWindow(Value) then
Error(KMN_E_KeymanControl_CannotUnregisterControllerWindow);
if hlibKeyman32 = 0 then
KL.LogError('UnregisterControllerWindow: keyman32.dll is not loaded')
else if not FKeyman_UnregisterControllerWindow(Value) then
KL.LogError('UnregisterControllerWindow: Could not unregister controller window %x', [Value]);
{$ENDIF}
end;