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

Bug2529: don't lose data when closing without saving on small drive (#650)

Browse Source
This commit is contained in:
Paul Licameli
2020-08-28 14:03:35 -04:00
committed by GitHub
parent 29f3361746
commit 1bb34e703e
5 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ProjectFileManager.cpp
View File

@@ -654,7 +654,7 @@ bool ProjectFileManager::SaveFromTimerRecording(wxFileName fnFile)
return success;
}
void ProjectFileManager::CompactProject()
void ProjectFileManager::CompactProjectOnClose()
{
auto &project = mProject;
auto &projectFileIO = ProjectFileIO::Get(project);
@@ -671,6 +671,15 @@ void ProjectFileManager::CompactProject()
// Attempt to compact the project
projectFileIO.Compact(mLastSavedTracks);
if ( !projectFileIO.WasCompacted() &&
UndoManager::Get( project ).UnsavedChanges() ) {
// If compaction failed, we must do some work in case of close
// without save. Don't leave the document blob from the last
// push of undo history, when that undo state may get purged
// with deletion of some new sample blocks.
projectFileIO.UpdateSaved( mLastSavedTracks );
}
}
}
@@ -689,7 +698,7 @@ void ProjectFileManager::CloseProject()
projectFileIO.CloseProject();
// Blocks were locked in CompactProject, so DELETE the data structure so that
// Blocks were locked in CompactProjectOnClose, so DELETE the data structure so that
// there's no memory leak.
if (mLastSavedTracks)
{