erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-25 17:17:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix(windows): merge resloution fix unused var

Browse source 
This fixes a merge resolution from master to the
branch. It also removes unused variables, from
a previous change.
This commit is contained in:
rc-swag 2026-09-23 11:41:45 +10:00
parent 6c775d5819
commit 71ccb1ab6f
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
windows/src/desktop/kmshell/main/UfrmBaseKeyboard.pas
View file

@ -42,7 +42,6 @@ uses
function ConfigureAndSetBaseKeyboard(WindowHandle: THandle): Boolean;
var BaseKeyboardID: Integer;
begin
with TfrmBaseKeyboard.Create(nil) do
try

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

@ -666,8 +666,6 @@ end;
------------------------------------------------------------------------------}
procedure TfrmMain.Options_BaseKeyboard; // I4169
var
BaseKeyboardID: Integer;
begin
if ConfigureAndSetBaseKeyboard(Handle) then
begin

13
windows/src/engine/kmcomapi/processes/package/kpinstallpackage.pas
View file

@ -163,9 +163,18 @@ begin
inf := nil;
FZip := TZipFile.Create;
try
FZip.Open(FileName, TZipMode.zmRead);
try
FZip.Open(FileName, TZipMode.zmRead);
except
on E:EZipException do
begin
ErrorFmt(KMN_E_Install_InvalidFile, VarArrayOf([ExtractFileName(FileName), E.Message, 0]));
raise;
end;
end;
InfFile := '';
try
InfFile := '';
for i := 0 to FZip.FileCount - 1 do
begin