From faa541f613ffc9ebe3e53a84f448936d033e0a80 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 25 Oct 2019 13:06:14 +0200 Subject: Windows: for system encryption case, also perform automatic fix of boot configuration if MBR boot used and not only EFI. --- src/Mount/Mount.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'src/Mount') diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index 4ee32dfb..2837d449 100644 --- a/src/Mount/Mount.c +++ b/src/Mount/Mount.c @@ -9422,25 +9422,21 @@ static DWORD WINAPI SystemFavoritesServiceCtrlHandler ( DWORD dwControl, case SERVICE_CONTROL_STOP: SystemFavoritesServiceSetStatus (SERVICE_STOP_PENDING); - if (bSystemIsGPT) + if (!(BootEncObj->ReadServiceConfigurationFlags () & VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER)) { - uint32 serviceFlags = BootEncObj->ReadServiceConfigurationFlags (); - if (!(serviceFlags & VC_SYSTEM_FAVORITES_SERVICE_CONFIG_DONT_UPDATE_LOADER)) + try { - try - { - BootEncryption::UpdateSetupConfigFile (true); - if (!BootEncStatus.HiddenSystem) - { - // re-install our bootloader again in case the update process has removed it. - BootEncryption bootEnc (NULL, true); - bootEnc.InstallBootLoader (true); - } - } - catch (...) + BootEncryption::UpdateSetupConfigFile (true); + if (!BootEncStatus.HiddenSystem) { + // re-install our bootloader again in case the update process has removed it. + BootEncryption bootEnc (NULL, true); + bootEnc.InstallBootLoader (true); } } + catch (...) + { + } } /* clear VC_DRIVER_CONFIG_CLEAR_KEYS_ON_NEW_DEVICE_INSERTION flag */ -- cgit v1.2.3