Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore cwd even if wxFileDialog is cancelled in wxMSW

Browse Source 
Sometimes the file dialog changes the current directory even if it is
cancelled, so restore it in any case, not only after successful return.

See https://github.com/wxWidgets/wxWidgets/pull/263

(cherry picked from commit ceaa840d7b)
This commit is contained in:
Steve Browne
2016-03-31 18:32:07 -04:00
committed by Vadim Zeitlin
parent f358979d35
commit 7b224881d0
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/filedlg.cpp
View File

@@ -676,23 +676,30 @@ int wxFileDialog::ShowModal()
} }
} }
// Create a temporary struct to restore the CWD when we exit this function
// store off before the standard windows dialog can possibly change it // store off before the standard windows dialog can possibly change it
const wxString cwdOrig = wxGetCwd(); struct CwdRestore
{
//== Execute FileDialog >>================================================= wxString value;
~CwdRestore()
if ( !ShowCommFileDialog(&of, m_windowStyle) ) {
return wxID_CANCEL; if (!value.empty())
wxSetWorkingDirectory(value);
}
} cwdOrig;
// GetOpenFileName will always change the current working directory on // GetOpenFileName will always change the current working directory on
// (according to MSDN) "Windows NT 4.0/2000/XP" because the flag // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
// OFN_NOCHANGEDIR has no effect. If the user did not specify // OFN_NOCHANGEDIR has no effect. If the user did not specify
// wxFD_CHANGE_DIR let's restore the current working directory to what it // wxFD_CHANGE_DIR let's restore the current working directory to what it
// was before the dialog was shown. // was before the dialog was shown.
if ( msw_flags & OFN_NOCHANGEDIR ) if (msw_flags & OFN_NOCHANGEDIR)
{ cwdOrig.value = wxGetCwd();
wxSetWorkingDirectory(cwdOrig);
} //== Execute FileDialog >>=================================================
if ( !ShowCommFileDialog(&of, m_windowStyle) )
return wxID_CANCEL;
m_fileNames.Empty(); m_fileNames.Empty();