Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-12 03:18:26 -06:00
Code Activity

Linux/MacOSX: Avoid OS leaking previously used directory if user choose not to save history.

Browse Source
This commit is contained in:
Mounir IDRASSI
2017-12-06 15:46:03 +01:00
parent b4ed8de5d5
commit d6f03627dd
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Main/GraphicUserInterface.cpp
View File

@@ -1569,13 +1569,18 @@ namespace VeraCrypt
DirectoryPath GraphicUserInterface::SelectDirectory (wxWindow *parent, const wxString &message, bool existingOnly) const DirectoryPath GraphicUserInterface::SelectDirectory (wxWindow *parent, const wxString &message, bool existingOnly) const
{ {
/* Avoid OS leaking previously used directory when user choose not to save history */
wxString defaultPath;
if (!GetPreferences().SaveHistory)
defaultPath = wxGetHomeDir ();
return DirectoryPath (::wxDirSelector (!message.empty() ? message : return DirectoryPath (::wxDirSelector (!message.empty() ? message :
#ifdef __WXGTK__ #ifdef __WXGTK__
wxDirSelectorPromptStr, wxDirSelectorPromptStr,
#else #else
L"", L"",
#endif #endif
L"", wxDD_DEFAULT_STYLE | (existingOnly ? wxDD_DIR_MUST_EXIST : 0), wxDefaultPosition, parent).wc_str()); defaultPath, wxDD_DEFAULT_STYLE | (existingOnly ? wxDD_DIR_MUST_EXIST : 0), wxDefaultPosition, parent).wc_str());
} }
FilePathList GraphicUserInterface::SelectFiles (wxWindow *parent, const wxString &caption, bool saveMode, bool allowMultiple, const list < pair <wstring, wstring> > &fileExtensions, const DirectoryPath &directory) const FilePathList GraphicUserInterface::SelectFiles (wxWindow *parent, const wxString &caption, bool saveMode, bool allowMultiple, const list < pair <wstring, wstring> > &fileExtensions, const DirectoryPath &directory) const
@@ -1614,7 +1619,12 @@ namespace VeraCrypt
} }
} }
wxFileDialog dialog (parent, !caption.empty() ? caption : LangString ["OPEN_TITLE"], wstring (directory), wxString(), wildcards, style); /* Avoid OS leaking previously used directory when user choose not to save history */
wxString defaultDir = wstring (directory);
if (defaultDir.IsEmpty () && !GetPreferences().SaveHistory)
defaultDir = wxGetHomeDir ();
wxFileDialog dialog (parent, !caption.empty() ? caption : LangString ["OPEN_TITLE"], defaultDir, wxString(), wildcards, style);
if (dialog.ShowModal() == wxID_OK) if (dialog.ShowModal() == wxID_OK)
{ {