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

Show correct save path when using compressed debug report

Browse Source 
The compressed report location could be set to a different location from
the one shown in the dialog.

Closes #17176.

Closes https://github.com/wxWidgets/wxWidgets/pull/797
This commit is contained in:
Maarten Bent
2016-09-01 15:20:52 +02:00
committed by Vadim Zeitlin
parent 390c45d1d9
commit 59c37cb5eb
3 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/debugrpt.cpp
View File

@@ -594,6 +594,13 @@ bool wxDebugReport::DoProcess()
return true;
}
wxFileName wxDebugReport::GetSaveLocation() const
{
wxFileName fn;
fn.SetPath(GetDirectory());
return fn;
}
// ============================================================================
// wxDebugReport-derived classes
// ============================================================================
@@ -618,6 +625,19 @@ void wxDebugReportCompress::SetCompressedFileBaseName(const wxString& name)
m_zipName = name;
}
wxFileName wxDebugReportCompress::GetSaveLocation() const
{
// Use de default directoy as a basis for the save location, e.g.
// %temp%/someName becomes %temp%/someName.zip.
wxFileName fn(GetDirectory());
if (!m_zipDir.empty())
fn.SetPath(m_zipDir);
if (!m_zipName.empty())
fn.SetName(m_zipName);
fn.SetExt("zip");
return fn;
}
bool wxDebugReportCompress::DoProcess()
{
#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
@@ -626,19 +646,8 @@ bool wxDebugReportCompress::DoProcess()
if ( !count )
return false;
// create the compressed report file outside of the directory with the
// report files as it will be deleted by wxDebugReport dtor but we want to
// keep this one: for this we simply treat the directory name as the name
// of the file so that its last component becomes our base name
wxFileName fn(GetDirectory());
if ( !m_zipDir.empty() )
fn.SetPath(m_zipDir);
if ( !m_zipName.empty() )
fn.SetName(m_zipName);
fn.SetExt("zip");
// create the streams
const wxString ofullPath = fn.GetFullPath();
const wxString ofullPath = GetSaveLocation().GetFullPath();
#if wxUSE_FFILE
wxFFileOutputStream os(ofullPath, wxT("wb"));
#elif wxUSE_FILE