Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-20 15:41:18 +01:00
Code Issues Releases Wiki Activity

Bug1594, 1567: Don't destroy source project when saving-as!

Browse Source
This commit is contained in:
Paul Licameli
2017-02-19 12:55:01 -05:00
parent 0ceae62964
commit 5b10c386e9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/DirManager.cpp
View File

@@ -434,6 +434,7 @@ void DirManager::CleanDir(
bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const bool bCreate) bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const bool bCreate)
{ {
bool copying = false;
wxString oldPath = this->projPath; wxString oldPath = this->projPath;
wxString oldName = this->projName; wxString oldName = this->projName;
wxString oldFull = projFull; wxString oldFull = projFull;
@@ -495,7 +496,7 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const
BlockFilePtr b = iter->second.lock(); BlockFilePtr b = iter->second.lock();
if (b) { if (b) {
if (b->IsLocked()) if (b->IsLocked())
success = CopyToNewProjectDirectory( &*b ); success = CopyToNewProjectDirectory( &*b ), copying = true;
else{ else{
success = MoveToNewProjectDirectory( &*b ); success = MoveToNewProjectDirectory( &*b );
} }
@@ -545,7 +546,10 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const
// loading a project; in this latter case, the movement code does // loading a project; in this latter case, the movement code does
// nothing because SetProject is called before there are any // nothing because SetProject is called before there are any
// blockfiles. Cleanup code trigger is the same // blockfiles. Cleanup code trigger is the same
if (trueTotal > 0) {
// Do the cleanup of the temporary directory only if not saving-as, which we
// detect by having done copies rather than moves.
if (!copying && trueTotal > 0) {
// Clean up after ourselves; boldly remove all files and directories // Clean up after ourselves; boldly remove all files and directories
// in the tree. (Unlike what the earlier version of this comment said.) // in the tree. (Unlike what the earlier version of this comment said.)
// Because this is a relocation of the project, not the case of closing // Because this is a relocation of the project, not the case of closing