Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 16:40:07 +02:00
Code Issues Releases Wiki Activity

Fewer uses of DirManager::GetProjectName()

Browse Source
This commit is contained in:
Paul Licameli 2018-01-16 18:26:33 -05:00
parent 356763c90b
commit d37c319923
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Project.cpp
View File

@ -3661,7 +3661,7 @@ void AudacityProject::WriteXML(XMLWriter &xmlFile, bool bWantSaveCompressed)
// then the file has been saved. This is not neccessarily true when // then the file has been saved. This is not neccessarily true when
// autosaving as it gets set by AddImportedTracks (presumably as a proposal). // autosaving as it gets set by AddImportedTracks (presumably as a proposal).
// I don't think that mDirManager.projName gets set without a save so check that. // I don't think that mDirManager.projName gets set without a save so check that.
if( mDirManager->GetProjectName() == wxT("") ) if( !IsProjectSaved() )
projName = wxT("_data"); projName = wxT("_data");
} }
@ -3771,7 +3771,7 @@ private:
bool AudacityProject::Save() bool AudacityProject::Save()
{ {
if (mDirManager->GetProjectName() == wxT("")) if ( !IsProjectSaved() )
return SaveAs(); return SaveAs();
return DoSave(false, false); return DoSave(false, false);
@ -3872,7 +3872,7 @@ bool AudacityProject::DoSave
mStrOtherNamesArray.clear(); mStrOtherNamesArray.clear();
} ); } );
if (fromSaveAs || mDirManager->GetProjectName() == wxT("")) { if (fromSaveAs || !IsProjectSaved() ) {
// This block of code is duplicated in WriteXML, for now... // This block of code is duplicated in WriteXML, for now...
project = mFileName; project = mFileName;
if (project.Len() > 4 && project.Mid(project.Len() - 4) == wxT(".aup")) if (project.Len() > 4 && project.Mid(project.Len() - 4) == wxT(".aup"))
@ -3929,7 +3929,7 @@ bool AudacityProject::DoSave
if (!success) if (!success)
return false; return false;
if (fromSaveAs || mDirManager->GetProjectName() == wxT("")) { if (fromSaveAs || !IsProjectSaved() ) {
if (!bWantSaveCompressed) if (!bWantSaveCompressed)
{ {
// We are about to move files from the current directory to // We are about to move files from the current directory to
@ -4215,7 +4215,7 @@ AudacityProject::AddImportedTracks(const wxString &fileName,
wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI | wxEVT_CATEGORY_USER_INPUT); wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI | wxEVT_CATEGORY_USER_INPUT);
#endif #endif
if (initiallyEmpty && mDirManager->GetProjectName() == wxT("")) { if (initiallyEmpty && !IsProjectSaved() ) {
wxString name = fileName.AfterLast(wxFILE_SEP_PATH).BeforeLast(wxT('.')); wxString name = fileName.AfterLast(wxFILE_SEP_PATH).BeforeLast(wxT('.'));
mFileName =::wxPathOnly(fileName) + wxFILE_SEP_PATH + name + wxT(".aup"); mFileName =::wxPathOnly(fileName) + wxFILE_SEP_PATH + name + wxT(".aup");
mbLoadedFromAup = false; mbLoadedFromAup = false;
@ -5794,6 +5794,9 @@ int AudacityProject::GetOpenProjectCount() {
} }
bool AudacityProject::IsProjectSaved() { bool AudacityProject::IsProjectSaved() {
// This is true if a project was opened from an .aup
// Otherwise it becomes true only when a project is first saved successfully
// in DirManager::SetProject
wxString sProjectName = mDirManager->GetProjectName(); wxString sProjectName = mDirManager->GetProjectName();
return (sProjectName != wxT("")); return (sProjectName != wxT(""));
} }