From f6fcb596bc4cbd36890259a307c0c8b80bd62676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 11 Jul 2026 22:24:18 +0200 Subject: [PATCH] [SETUPLIB] There is no need to update the keyboard settings only for non-unattended setup Updating keyboard layout settings with user-overridden values, was restricted to non-unattended setups, in an apparent attempt to fix in commit 829b0c63d9 (r38146) the problem reported at CORE-3634. This special-casing is now unnecessary. --- base/setup/lib/setuplib.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index e5ef76bbd44..f15c282383a 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -1336,22 +1336,19 @@ DoUpdate: goto Cleanup; } - if (!IsUnattendedSetup) - { - Entry = GetCurrentListEntry(pSetupData->LayoutList); - ASSERT(Entry); - pSetupData->LayoutId = ((PGENENTRY)GetListEntryData(Entry))->Id; - ASSERT(pSetupData->LayoutId); + Entry = GetCurrentListEntry(pSetupData->LayoutList); + ASSERT(Entry); + pSetupData->LayoutId = ((PGENENTRY)GetListEntryData(Entry))->Id; + ASSERT(pSetupData->LayoutId); - /* Update keyboard layout settings with user-overridden values */ - // FIXME: Wouldn't it be better to do it all at once - // with the AddKeyboardLayouts() step? - if (StatusRoutine) StatusRoutine(KeybSettingsUpdate); - if (!ProcessKeyboardLayoutRegistry(pSetupData->LayoutId, SelectedLanguageId)) - { - ErrorNumber = ERROR_UPDATE_KBSETTINGS; - goto Cleanup; - } + /* Update keyboard layout settings with user-overridden values */ + // FIXME: Wouldn't it be better to do it all at once + // with the AddKeyboardLayouts() step? + if (StatusRoutine) StatusRoutine(KeybSettingsUpdate); + if (!ProcessKeyboardLayoutRegistry(pSetupData->LayoutId, SelectedLanguageId)) + { + ErrorNumber = ERROR_UPDATE_KBSETTINGS; + goto Cleanup; } /* Set GeoID */