Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Bug2550 residual: also move -shm file if present...

Browse Source 
... Also much other extra care in the handling of -shm and -wal files
This commit is contained in:
Paul Licameli
2020-11-22 12:20:05 -05:00
parent b32ce8ab21
commit 3e0120be05
3 changed files with 182 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/ProjectFileManager.cpp
View File

@@ -288,33 +288,12 @@ bool ProjectFileManager::DoSave(const FilePath & fileName, const bool fromSaveAs
// End of confirmations
// Always save a backup of the original project file
wxString safetyFileName;
Optional<ProjectFileIO::BackupProject> pBackupProject;
if (fromSaveAs && wxFileExists(fileName))
{
#ifdef __WXGTK__
safetyFileName = fileName + wxT("~");
#else
safetyFileName = fileName + wxT(".bak");
#endif
if (wxFileExists(safetyFileName))
{
wxRemoveFile(safetyFileName);
}
if ( !wxRenameFile(fileName, safetyFileName) )
{
ShowErrorDialog(
&window,
XO("Error Writing to File"),
XO("Audacity failed to write file %s.\n"
"Perhaps disk is full or not writable.\n"
"For tips on freeing up space, click the help button.")
.Format(safetyFileName),
"Error:_Disk_full_or_not_writable"
);
pBackupProject.emplace(projectFileIO, fileName);
if (!pBackupProject->IsOk())
return false;
}
}
bool success = projectFileIO.SaveProject(fileName, mLastSavedTracks.get());
@@ -329,16 +308,6 @@ bool ProjectFileManager::DoSave(const FilePath & fileName, const bool fromSaveAs
.Format(fileName),
"Error:_Disk_full_or_not_writable"
);
if (fromSaveAs)
{
if (wxFileExists(fileName))
{
wxRemoveFile(fileName);
}
wxRename(safetyFileName, fileName);
}
return false;
}
@@ -361,12 +330,9 @@ bool ProjectFileManager::DoSave(const FilePath & fileName, const bool fromSaveAs
}
// If we get here, saving the project was successful, so we can DELETE
// the .bak file (because it now does not fit our block files anymore
// anyway).
if (!safetyFileName.empty())
{
wxRemoveFile(safetyFileName);
}
// any backup project.
if (pBackupProject)
pBackupProject->Discard();
return true;
}