diff options
Diffstat (limited to 'src/Main/UserInterface.cpp')
| -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 |