Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-06 19:52:19 +01:00
Code Issues Releases Wiki Activity

Bug 137 (P2) - fix false positive detection of orphaned files that belong to the clipboard (triggered by cut commands)

Browse Source
This commit is contained in:
mchinen
2011-04-21 21:51:56 +00:00
parent cd42c0a130
commit ee9e244b77
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/DirManager.cpp
View File

@@ -910,11 +910,17 @@ BlockFile *DirManager::NewODDecodeBlockFile(
return newBlockFile;
}
bool DirManager::ContainsBlockFile(BlockFile *b) {
// check what the hash returns in case the blockfile is from a different project
bool DirManager::ContainsBlockFile(BlockFile *b)
{
return b ? mBlockFileHash[b->GetFileName().GetName()] == b : NULL;
}
bool DirManager::ContainsBlockFile(wxString filepath)
{
// check what the hash returns in case the blockfile is from a different project
return mBlockFileHash[filepath] != NULL;
}
// Adds one to the reference count of the block file,
// UNLESS it is "locked", then it makes a new copy of
// the BlockFile.
@@ -1695,6 +1701,8 @@ void DirManager::FindOrphanBlockFiles(
const wxArrayString& filePathArray, // input: all files in project directory
wxArrayString& orphanFilePathArray) // output: orphan files
{
DirManager *clipboardDM = NULL;
for (size_t i = 0; i < filePathArray.GetCount(); i++)
{
wxFileName fullname = filePathArray[i];
@@ -1705,7 +1713,20 @@ void DirManager::FindOrphanBlockFiles(
(fullname.GetExt().IsSameAs(wxT("au")) ||
fullname.GetExt().IsSameAs(wxT("auf"))))
{
orphanFilePathArray.Add(fullname.GetFullPath());
if (!clipboardDM) {
TrackList *clipTracks = AudacityProject::GetClipboardTracks();
if (clipTracks) {
TrackListIterator clipIter(clipTracks);
Track *track = clipIter.First();
if (track)
clipboardDM = track->GetDirManager();
}
}
// Ignore it if it exists in the clipboard (from a previously closed project)
if (clipboardDM && clipboardDM->ContainsBlockFile(fullname.GetFullPath()))
orphanFilePathArray.Add(fullname.GetFullPath());
}
}
for (size_t i = 0; i < orphanFilePathArray.GetCount(); i++)