mirrors
/
VeraCrypt
mirror of https://github.com/veracrypt/VeraCrypt.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Linux: Restore Nautilus fix that was mistakenly removed by Whirlpool optimization commit

This commit is contained in:
Mounir IDRASSI 2016-01-03 09:29:09 +01:00
parent 723fcfa64d
commit ea8e8e517e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Main/UserInterface.cpp
View File

@ -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