VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main
diff options
context:
space:
mode:
authorJertzukka <Jertzukka@gmail.com>2023-06-01 10:01:53 +0300
committerGitHub <noreply@github.com>2023-06-01 09:01:53 +0200
commit6ced991d98da9645b97ed6cf2556ae2a76085116 (patch)
treec822b6f81231aaf422d21ac6954e390e07a9c069 /src/Main
parent5efda52d516846274b695a8986090bd28b302ce0 (diff)
downloadVeraCrypt-6ced991d98da9645b97ed6cf2556ae2a76085116.tar.gz
VeraCrypt-6ced991d98da9645b97ed6cf2556ae2a76085116.zip
Fix issues launching fsck via terminal on Linux (#1086)
Currently on a system without xterm or konsole (like fresh Ubuntu install) the fsck check will not launch. Added gnome-terminal as an alternative and fixed an issue where konsole will always error out as --title and --caption are no longer valid arguments. Previously the error message was simply "xterm not found", so new LangString LINUX_EX2MSG_TERMINALNOTFOUND was added to let the user knows which programs they need to get the feature working.
Diffstat (limited to 'src/Main')
-rw-r--r--src/Main/Forms/WaitDialog.cpp1
-rw-r--r--src/Main/UserInterface.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/Main/Forms/WaitDialog.cpp b/src/Main/Forms/WaitDialog.cpp
index 2976a6e8..795d7763 100644
--- a/src/Main/Forms/WaitDialog.cpp
+++ b/src/Main/Forms/WaitDialog.cpp
@@ -74,6 +74,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (ParameterTooLarge);
VC_CONVERT_EXCEPTION (PartitionDeviceRequired);
VC_CONVERT_EXCEPTION (StringConversionFailed);
+ VC_CONVERT_EXCEPTION (TerminalNotFound);
VC_CONVERT_EXCEPTION (TestFailed);
VC_CONVERT_EXCEPTION (TimeOut);
VC_CONVERT_EXCEPTION (UnknownException);
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 9c7d4e29..1a237bbe 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -481,6 +481,7 @@ namespace VeraCrypt
EX2MSG (UnportablePassword, LangString["UNSUPPORTED_CHARS_IN_PWD"]);
#if defined (TC_LINUX)
+ EX2MSG (TerminalNotFound, LangString["LINUX_EX2MSG_TERMINALNOTFOUND"]);
EX2MSG (UnsupportedSectorSize, LangString["SECTOR_SIZE_UNSUPPORTED"]);
EX2MSG (UnsupportedSectorSizeHiddenVolumeProtection, LangString["LINUX_EX2MSG_UNSUPPORTEDSECTORSIZEHIDDENVOLUMEPROTECTION"]);
EX2MSG (UnsupportedSectorSizeNoKernelCrypto, LangString["LINUX_EX2MSG_UNSUPPORTEDSECTORSIZENOKERNELCRYPTO"]);
@@ -1620,6 +1621,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (ParameterTooLarge);
VC_CONVERT_EXCEPTION (PartitionDeviceRequired);
VC_CONVERT_EXCEPTION (StringConversionFailed);
+ VC_CONVERT_EXCEPTION (TerminalNotFound);
VC_CONVERT_EXCEPTION (TestFailed);
VC_CONVERT_EXCEPTION (TimeOut);
VC_CONVERT_EXCEPTION (UnknownException);