mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-10 21:23:40 +01:00
Windows Installer: check newly added files if they are used before resuming installation. Avoid using driver handle to check if we are using system encryption.
This commit is contained in:
parent
d98367f53b
commit
0eec3bc349
@ -865,7 +865,7 @@ BOOL DoFilesInstall (HWND hwndDlg, char *szDestDir)
|
||||
|
||||
try
|
||||
{
|
||||
if (BootEncObj.GetStatus().DriveMounted)
|
||||
if (BootEncObj.GetDriverServiceStartType() == SERVICE_BOOT_START)
|
||||
{
|
||||
BootEncObj.UpdateSystemFavoritesService ();
|
||||
}
|
||||
@ -2086,7 +2086,14 @@ void DoInstall (void *arg)
|
||||
|
||||
if (bUpgrade
|
||||
&& (IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME ".exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "-x86.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "-x64.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Format.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Format-x86.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Format-x64.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "Expander.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "Expander-x86.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME "Expander-x64.exe")
|
||||
|| IsFileInUse (string (InstallationPath) + '\\' + TC_APP_NAME " Setup.exe")
|
||||
)
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user