Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-04 09:39:42 +02:00
Code Issues Releases Wiki Activity

(bug 451, P2)

Browse Source 
See first topic at http://bugzilla.audacityteam.org/show_bug.cgi?id=451#c16. Calling mTracks->Clear() with deleteTracks true resulted in data loss. Also, although a fatal error, it continued doing some project-opening tasks, i.e., GetDirManager()->FillBlockfilesCache() and setting up OD stuff, that are pointless if parse failed and all the tracks are thrown out.

Capitalized "Error Opening Project" titles -- as titles should be.
This commit is contained in:
v.audacity 2011-10-30 22:55:35 +00:00
parent b5c429d58f
commit b712ccda82
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Project.cpp
View File

@ -2182,7 +2182,7 @@ bool AudacityProject::IsAlreadyOpen(const wxString projPathName)
wxString::Format(_("%s is already open in another window."),
newProjPathName.GetName().c_str());
wxLogError(errMsg);
wxMessageBox(errMsg, _("Error opening project"), wxOK | wxCENTRE);
wxMessageBox(errMsg, _("Error Opening Project"), wxOK | wxCENTRE);
return true;
}
}
@ -2342,7 +2342,7 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
bool success = ConvertLegacyProjectFile(wxFileName(fileName));
if (!success) {
wxMessageBox(_("Audacity was unable to convert an Audacity 1.0 project to the new project format."),
_("Error opening project"),
_("Error Opening Project"),
wxOK | wxCENTRE, this);
return;
}
@ -2408,7 +2408,8 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
XMLFileReader xmlFile;
if (xmlFile.Parse(this, fileName)) {
bool bParseSuccess = xmlFile.Parse(this, fileName);
if (bParseSuccess) {
// By making a duplicate set of pointers to the existing blocks
// on disk, we add one to their reference count, guaranteeing
// that their reference counts will never reach zero and thus
@ -2551,13 +2552,17 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
}
}
} else {
mTracks->Clear(true);
// Vaughan, 2011-10-30:
// See first topic at http://bugzilla.audacityteam.org/show_bug.cgi?id=451#c16.
// Calling mTracks->Clear() with deleteTracks true results in data loss.
// mTracks->Clear(true);
mTracks->Clear();
mFileName = wxT("");
SetProjectTitle();
wxMessageBox(xmlFile.GetErrorStr(),
_("Error opening project"),
_("Error Opening Project"),
wxOK | wxCENTRE, this);
}
@ -2568,6 +2573,9 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
mRecordingRecoveryHandler = NULL;
}
if (!bParseSuccess)
return; // No need to do further processing if parse failed.
GetDirManager()->FillBlockfilesCache();
//check the ODManager to see if we should add the tracks to the ODManager.
@ -2733,7 +2741,7 @@ bool AudacityProject::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
if (!mDirManager->SetProject(projPath, projName, false)) {
wxMessageBox(wxString::Format(_("Couldn't find the project data folder: \"%s\""),
projName.c_str()),
_("Error opening project"),
_("Error Opening Project"),
wxOK | wxCENTRE, this);
return false;
}