VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-04-06 18:51:14 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-04-06 19:50:24 +0200
commitae28d510163d6108f3746ee1e5d64d00350ac8ee (patch)
tree5265f94b5e4ad1e445d1304db524bd618daf5a97
parent32f11001c039fd0de254be6c68f7c036389b9250 (diff)
downloadVeraCrypt-ae28d510163d6108f3746ee1e5d64d00350ac8ee.tar.gz
VeraCrypt-ae28d510163d6108f3746ee1e5d64d00350ac8ee.zip
Linux/MaxOSX: correctly detect type of internal exceptions
-rw-r--r--src/Main/Forms/WaitDialog.cpp8
-rw-r--r--src/Main/UserInterface.cpp7
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;
}
}