diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-12-02 11:10:30 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-12-04 22:20:42 +0100 |
| commit | 3a9db8d98c1301726bdf26af9698e7cc61a46f71 (patch) | |
| tree | a3b9b8d512e1edafac1a0789171687bc0d24ece1 /src/Main | |
| parent | 613ea66c95ada7d3c098a00cae4413d7bd7cf1ba (diff) | |
| download | VeraCrypt-3a9db8d98c1301726bdf26af9698e7cc61a46f71.tar.gz VeraCrypt-3a9db8d98c1301726bdf26af9698e7cc61a46f71.zip | |
Linux: fix Nautilus not detected as file manager on some Gnome based destributions.
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/UserInterface.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index 73c99142..2be5bc7e 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -834,8 +834,10 @@ namespace VeraCrypt #else // MIME handler for directory seems to be unavailable through wxWidgets wxString desktop = GetTraits()->GetDesktopEnvironment(); + bool xdgOpenPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open")); + bool nautilusPresent = wxFileName::IsFileExecutable (wxT("/usr/bin/nautilus")); - if (desktop == L"GNOME") + if (desktop == L"GNOME" || (desktop.empty() && !xdgOpenPresent && nautilusPresent)) { args.push_back ("--no-default-window"); args.push_back ("--no-desktop"); @@ -868,7 +870,7 @@ namespace VeraCrypt catch (exception &e) { ShowError (e); } } } - else if (wxFileName::IsFileExecutable (wxT("/usr/bin/xdg-open"))) + else if (xdgOpenPresent) { // Fallback on the standard xdg-open command // which is not always available by default |