diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main/Forms/WaitDialog.cpp | 8 | ||||
| -rw-r--r-- | src/Main/UserInterface.cpp | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/Main/Forms/WaitDialog.cpp b/src/Main/Forms/WaitDialog.cpp index 4fc6f60d..048bb91f 100644 --- a/src/Main/Forms/WaitDialog.cpp +++ b/src/Main/Forms/WaitDialog.cpp @@ -29,10 +29,6 @@ namespace VeraCrypt void WaitDialog::ThrowException(Exception* ex) { #define VC_CONVERT_EXCEPTION(NAME) if (dynamic_cast<NAME*> (ex)) throw (NAME&) *ex; - VC_CONVERT_EXCEPTION (SystemException); - VC_CONVERT_EXCEPTION (CipherException); - VC_CONVERT_EXCEPTION (VolumeException); - VC_CONVERT_EXCEPTION (PasswordException); VC_CONVERT_EXCEPTION (PasswordIncorrect); VC_CONVERT_EXCEPTION (PasswordKeyfilesIncorrect); VC_CONVERT_EXCEPTION (PasswordOrKeyboardLayoutIncorrect); @@ -96,6 +92,10 @@ namespace VeraCrypt VC_CONVERT_EXCEPTION (SecurityTokenKeyfileNotFound); VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode); VC_CONVERT_EXCEPTION (UnsupportedTrueCryptFormat); + VC_CONVERT_EXCEPTION (SystemException); + VC_CONVERT_EXCEPTION (CipherException); + VC_CONVERT_EXCEPTION (VolumeException); + VC_CONVERT_EXCEPTION (PasswordException); throw *ex; } } diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index a0819787..62966e77 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -1588,9 +1588,12 @@ namespace VeraCrypt VC_CONVERT_EXCEPTION (SecurityTokenLibraryNotInitialized); VC_CONVERT_EXCEPTION (SecurityTokenKeyfileAlreadyExists); VC_CONVERT_EXCEPTION (SecurityTokenKeyfileNotFound); - VC_CONVERT_EXCEPTION (SystemException); - VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode); + VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode); VC_CONVERT_EXCEPTION (UnsupportedTrueCryptFormat); + VC_CONVERT_EXCEPTION (SystemException); + VC_CONVERT_EXCEPTION (CipherException); + VC_CONVERT_EXCEPTION (VolumeException); + VC_CONVERT_EXCEPTION (PasswordException); throw *ex; } } |