mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-12 11:28:26 -06:00
Linux/MacOSX: Implement TrueCrypt conversion and loading support. Correct many GTK issues linked to multi-threaded origine of events by implementing an automatic mechanism for handling such requests in the main thread.
This commit is contained in:
11
src/Main/Forms/WaitDialog.cpp
Executable file → Normal file
11
src/Main/Forms/WaitDialog.cpp
Executable file → Normal file
@@ -15,11 +15,12 @@
|
||||
namespace VeraCrypt
|
||||
{
|
||||
DEFINE_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOGTHREAD_COMPLETED)
|
||||
DEFINE_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_ADMIN_PASSWORD)
|
||||
DEFINE_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_PIN)
|
||||
DEFINE_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_SHOW_MSG)
|
||||
|
||||
wxThread::ExitCode WaitThread::Entry()
|
||||
{
|
||||
wxCommandEvent finishEvent( wxEVT_COMMAND_WAITDIALOGTHREAD_COMPLETED,0);
|
||||
|
||||
{
|
||||
m_pRoutine->Execute();
|
||||
wxQueueEvent (m_pHandler, new wxCommandEvent( wxEVT_COMMAND_WAITDIALOGTHREAD_COMPLETED,0));
|
||||
return (wxThread::ExitCode)0; // success
|
||||
@@ -88,7 +89,9 @@ namespace VeraCrypt
|
||||
VC_CONVERT_EXCEPTION (InvalidSecurityTokenKeyfilePath);
|
||||
VC_CONVERT_EXCEPTION (SecurityTokenLibraryNotInitialized);
|
||||
VC_CONVERT_EXCEPTION (SecurityTokenKeyfileAlreadyExists);
|
||||
VC_CONVERT_EXCEPTION (SecurityTokenKeyfileNotFound);
|
||||
VC_CONVERT_EXCEPTION (SecurityTokenKeyfileNotFound);
|
||||
VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode);
|
||||
VC_CONVERT_EXCEPTION (UnsupportedTrueCryptFormat);
|
||||
throw *ex;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user