Bug 2655 - (Updated error msg and help link)
Following feedback from QA.
This commit is contained in:
parent
ab30778306
commit
9d800c8969
|
@ -1219,23 +1219,20 @@ bool ProjectFileManager::Import(
|
||||||
auto newTags = oldTags->Duplicate();
|
auto newTags = oldTags->Duplicate();
|
||||||
Tags::Set( project, newTags );
|
Tags::Set( project, newTags );
|
||||||
|
|
||||||
bool success = true;
|
|
||||||
|
|
||||||
#ifndef EXPERIMENTAL_IMPORT_AUP3
|
#ifndef EXPERIMENTAL_IMPORT_AUP3
|
||||||
// Handle AUP3 ("project") files specially
|
// Handle AUP3 ("project") files specially
|
||||||
if (fileName.AfterLast('.').IsSameAs(wxT("aup3"), false)) {
|
if (fileName.AfterLast('.').IsSameAs(wxT("aup3"), false)) {
|
||||||
errorMessage = XO( "Cannot import aup3 format. Use Open instead");
|
ShowErrorDialog(&GetProjectFrame( project ), XO("Error Importing"),
|
||||||
success = false;
|
XO( "Cannot import AUP3 format. Use File > Open instead"),
|
||||||
|
wxT("File_Menu"));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if( success ){
|
bool success = Importer::Get().Import(project, fileName,
|
||||||
success = Importer::Get().Import(project, fileName,
|
|
||||||
&WaveTrackFactory::Get( project ),
|
&WaveTrackFactory::Get( project ),
|
||||||
newTracks,
|
newTracks,
|
||||||
newTags.get(),
|
newTags.get(),
|
||||||
errorMessage);
|
errorMessage);
|
||||||
}
|
|
||||||
|
|
||||||
if (!errorMessage.empty()) {
|
if (!errorMessage.empty()) {
|
||||||
// Error message derived from Importer::Import
|
// Error message derived from Importer::Import
|
||||||
// Additional help via a Help button links to the manual.
|
// Additional help via a Help button links to the manual.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user