From 2accd9e93f3f604da06976f28c18f4c6b5dc4bec Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Wed, 15 Jul 2020 08:40:39 -0500 Subject: [PATCH] AUP3: Bug 2187 - no error message) when using a missing aliased audio file --- src/import/ImportAUP.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/import/ImportAUP.cpp b/src/import/ImportAUP.cpp index f2572c12c..81d3711d0 100644 --- a/src/import/ImportAUP.cpp +++ b/src/import/ImportAUP.cpp @@ -303,6 +303,20 @@ ProgressResult AUPImportFileHandle::Import(TrackFactory *WXUNUSED(trackFactory), return ProgressResult::Failed; } + if (!mErrorMsg.empty()) + { + AudacityMessageBox( + mErrorMsg, + XO("Import Project"), + wxOK | wxCENTRE, + &GetProjectFrame(mProject)); + + if (mUpdateResult == ProgressResult::Failed) + { + return ProgressResult::Failed; + } + } + sampleCount processed = 0; for (auto fi : mFiles) { @@ -1219,15 +1233,6 @@ bool AUPImportFileHandle::HandleSimpleBlockFile(XMLTagHandler *&handler) AddFile(len, filename); return true; - - if (filename.empty()) - { -// return AddSilence(len); - } - -// return AddSamples(filename, len); - - return true; } bool AUPImportFileHandle::HandleSilentBlockFile(XMLTagHandler *&handler) @@ -1264,8 +1269,6 @@ bool AUPImportFileHandle::HandleSilentBlockFile(XMLTagHandler *&handler) AddFile(len); return true; - - return AddSilence(len); } bool AUPImportFileHandle::HandlePCMAliasBlockFile(XMLTagHandler *&handler)