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

Bug 137 (P2) - Unreliable project re-opening with orphaned and missing blockfile errors

Browse Source 
Apply Michael's patch per http://bugzilla.audacityteam.org/show_bug.cgi?id=137#c15 and http://bugzilla.audacityteam.org/show_bug.cgi?id=137#c19.
This commit is contained in:
v.audacity 2011-03-25 23:13:07 +00:00
parent 995c11bcf9
commit 5e31b813d2
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DirManager.cpp
View File

@ -417,10 +417,8 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const
#endif #endif
} else { } else {
#ifndef __WXMAC__
if (!wxDirExists(projFull)) if (!wxDirExists(projFull))
return false; return false;
#endif
} }
/* Move all files into this new directory. Files which are /* Move all files into this new directory. Files which are

8
src/Project.cpp
View File

@ -2682,8 +2682,15 @@ bool AudacityProject::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
if (!projName.IsEmpty()) if (!projName.IsEmpty())
{ {
// First try to load the data files based on the _data dir given in the .aup file
// If this fails then try to use the filename of the .aup as the base directory
// This is because unzipped projects e.g. those that get transfered between mac-pc
// have encoding issues and end up expanding the wrong filenames for certain
// international characters (such as capital 'A' with an umlaut.)
if (!mDirManager->SetProject(projPath, projName, false)) if (!mDirManager->SetProject(projPath, projName, false))
{ {
projName = GetName() + wxT("_data");
if (!mDirManager->SetProject(projPath, projName, false)) {
wxMessageBox(wxString::Format(_("Couldn't find the project data folder: \"%s\""), wxMessageBox(wxString::Format(_("Couldn't find the project data folder: \"%s\""),
projName.c_str()), projName.c_str()),
_("Error opening project"), _("Error opening project"),
@ -2691,6 +2698,7 @@ bool AudacityProject::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
return false; return false;
} }
} }
}
requiredTags++; requiredTags++;
} }