Linux/MaxOSX: correctly detect type of internal exceptions

veracrypt · Apr 6, 2015 · ae28d51 · ae28d51
1 parent 32f1100
commit ae28d51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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;
 	}
 }