diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-02-09 00:49:04 +0100 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-02-09 00:52:28 +0100 |
commit | 39fb2edc25f2703744932f25d956bf7af604fc5f (patch) | |
tree | a25f2ab7bd6ee5d55b5e89093b86f6b7f802fa7e /src/Main/Forms/VolumeCreationWizard.cpp | |
parent | 0863924483c09d05948f63d1b1740f107e3e80fe (diff) | |
download | VeraCrypt-39fb2edc25f2703744932f25d956bf7af604fc5f.tar.gz VeraCrypt-39fb2edc25f2703744932f25d956bf7af604fc5f.zip |
Linux/MacOSX: add progress bar for mouse collected entropy in GUI of volume creation wizard. Add mutex protection in event handler for shared counter variable
Diffstat (limited to 'src/Main/Forms/VolumeCreationWizard.cpp')
-rwxr-xr-x | src/Main/Forms/VolumeCreationWizard.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp index 1e4c2513..e9ceb3a3 100755 --- a/src/Main/Forms/VolumeCreationWizard.cpp +++ b/src/Main/Forms/VolumeCreationWizard.cpp @@ -38,9 +38,9 @@ namespace VeraCrypt { VolumeCreationWizard::VolumeCreationWizard (wxWindow* parent) : WizardFrame (parent), CrossPlatformSupport (true), - DisplayKeyInfo (true), + DisplayKeyInfo (false), LargeFilesSupport (false), QuickFormatEnabled (false), SelectedFilesystemClusterSize (0), SelectedFilesystemType (VolumeCreationOptions::FilesystemType::FAT), @@ -377,8 +377,14 @@ namespace VeraCrypt long coord = event.GetX(); RandomNumberGenerator::AddToPool (ConstBufferPtr (reinterpret_cast <byte *> (&coord), sizeof (coord))); coord = event.GetY(); RandomNumberGenerator::AddToPool (ConstBufferPtr (reinterpret_cast <byte *> (&coord), sizeof (coord))); + + VolumeCreationProgressWizardPage *page = dynamic_cast <VolumeCreationProgressWizardPage *> (GetCurrentPage()); + if (page) + { + page->IncrementEntropyProgress (); + } } } void VolumeCreationWizard::OnProgressTimer () |