From f56a8c49f90bda734110f5ee28b2c405b417b057 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 14 Oct 2019 01:06:55 +0200 Subject: Windows: Fix regression that causes system favorites not to mount if VeraCrypt 1.24 is freshly installed and not updated. --- src/Common/BootEncryption.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp index 4061bde9..cc3caa92 100644 --- a/src/Common/BootEncryption.cpp +++ b/src/Common/BootEncryption.cpp @@ -4577,7 +4577,15 @@ namespace VeraCrypt { wchar_t appPath[TC_MAX_PATH]; throw_sys_if (!GetModuleFileName (NULL, appPath, ARRAYSIZE (appPath))); - + /* explicitely specify VeraCrypt.exe as the file to copy and don't rely + * on the fact we will be always called by VeraCrypt.exe because it's not + * always true. + */ + wchar_t* ptr = wcsrchr (appPath, L'\\'); + if (ptr) + ptr[1] = 0; + StringCchCatW (appPath, ARRAYSIZE (appPath), _T(TC_APP_NAME) L".exe"); + throw_sys_if (!CopyFile (appPath, servicePath.c_str(), FALSE)); } -- cgit v1.2.3