From 227e023cddce07cb88db3ea3ef998aba760bb81e Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Mon, 21 Dec 2020 08:56:34 +1100 Subject: [PATCH] fix(windows): disable mitigation for Windows 10 build 19597 and later Fixes #1285. If running Windows 10 19597 or later, the underlying issue has been addressed, so disable the mitigation for new installs of the keyboard. Does not attempt to change the language code if the keyboard is already installed. --- .../Keyman.System.MitigateWin10_1803LanguageInstall.pas | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/windows/src/engine/kmcomapi/processes/keyboard/Keyman.System.MitigateWin10_1803LanguageInstall.pas b/windows/src/engine/kmcomapi/processes/keyboard/Keyman.System.MitigateWin10_1803LanguageInstall.pas index 86cea39115..bbf5a72ace 100644 --- a/windows/src/engine/kmcomapi/processes/keyboard/Keyman.System.MitigateWin10_1803LanguageInstall.pas +++ b/windows/src/engine/kmcomapi/processes/keyboard/Keyman.System.MitigateWin10_1803LanguageInstall.pas @@ -98,7 +98,10 @@ class function TMitigateWin10_1803.IsMitigationRequired(BCP47Tag: string; var I: Integer; begin - if not IsWindows10_1803_OrGreater then + if not IsWindows10_OrGreater_Build(WINDOWS_10_BUILDNUMBER_WithFailure) then + Exit(False); + + if IsWindows10_OrGreater_Build(WINDOWS_10_BUILDNUMBER_Fixed) then Exit(False); // We only want to look at the primary language tag for comparison