mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-08-23 20:39:32 -05:00
Windows: stop auto-mount scan on mount cancellation
Add a cancel callback and batch abort flag so auto-mount-all stops after dialog cancellation. Mark MountVolume ERR_USER_ABORT with ERROR_CANCELLED so external /cancelmount also stops the scan.
This commit is contained in:
@@ -733,6 +733,7 @@ namespace VeraCrypt
|
||||
{
|
||||
FillFavoriteVolumesMenu();
|
||||
|
||||
::ClearFavoriteVolumeArrivalMountSuppressions ();
|
||||
FavoritesOnArrivalMountRequired.clear();
|
||||
|
||||
for (const FavoriteVolume& favorite: FavoriteVolumes)
|
||||
|
||||
+568
-110
File diff suppressed because it is too large
Load Diff
+1
-10
@@ -116,18 +116,9 @@ static BOOL CALLBACK DefaultMountParametersDlgProc (HWND hwndDlg, UINT msg, WPAR
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
typedef struct
|
||||
{
|
||||
BOOL systemFavorites;
|
||||
BOOL logOnMount;
|
||||
BOOL hotKeyMount;
|
||||
/* Owned by the thread parameter when non-NULL. */
|
||||
VeraCrypt::FavoriteVolume* favoriteVolumeToMount;
|
||||
} mountFavoriteVolumeThreadParam;
|
||||
|
||||
void SetDriverConfigurationFlag (uint32 flag, BOOL state);
|
||||
BOOL MountFavoriteVolumes (HWND hwnd, BOOL systemFavorites = FALSE, BOOL logOnMount = FALSE, BOOL hotKeyMount = FALSE, const VeraCrypt::FavoriteVolume &favoriteVolumeToMount = VeraCrypt::FavoriteVolume());
|
||||
void __cdecl mountFavoriteVolumeThreadFunction (void *pArg);
|
||||
void ClearFavoriteVolumeArrivalMountSuppressions ();
|
||||
|
||||
// A class that represents a device based on its device ID
|
||||
class CDevice
|
||||
|
||||
Reference in New Issue
Block a user