diff --git a/src/Project.cpp b/src/Project.cpp index 4746bf7a0..53996877a 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -4182,6 +4182,15 @@ bool AudacityProject::SaveAs(bool bWantSaveCompressed /*= false*/) TitleRestorer Restorer(this); // RAII wxFileName filename(mFileName); + // Bug 1304: Set a default file path if none was given. For Save/SaveAs + if( filename.GetFullPath().IsEmpty() ){ + filename.AssignHomeDir(); +#ifdef __WIN32__ + filename.SetPath(filename.GetPath() + "\\Documents"); +#else + filename.SetPath(filename.GetPath() + "/Documents"); +#endif + } wxString sDialogTitle; if (bWantSaveCompressed) diff --git a/src/export/Export.cpp b/src/export/Export.cpp index fa9dbc387..24c03dd90 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -518,7 +518,15 @@ bool Exporter::GetFilename() } maskString.RemoveLast(); - mFilename.SetPath(gPrefs->Read(wxT("/Export/Path"), ::wxGetCwd())); +//Bug 1304: Set a default path if none was given. For Export. +#ifdef __WIN32__ + wxFileName tmpFile; + tmpFile.AssignHomeDir(); + wxString tmpDirLoc = tmpFile.GetPath(wxPATH_GET_VOLUME); + mFilename.SetPath(gPrefs->Read(wxT("/Export/Path"), tmpDirLoc + "\\Documents")); +#else + mFilename.SetPath(gPrefs->Read(wxT("/Export/Path"), wxT("~/Documents"))); +#endif mFilename.SetName(mProject->GetName()); while (true) { // Must reset each iteration