From ea8e8e517e7829a5cdbc5731f26844cfb5597618 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 3 Jan 2016 09:29:09 +0100 Subject: Linux: Restore Nautilus fix that was mistakenly removed by Whirlpool optimization commit --- src/Main/UserInterface.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp index 1648d94c..c7d975de 100644 --- a/src/Main/UserInterface.cpp +++ b/src/Main/UserInterface.cpp @@ -838,8 +838,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"); @@ -872,7 +874,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 -- cgit v1.2.3