From aa89805fd2cf2949f31e43f249581e623215c2cf Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Wed, 27 Jan 2021 01:19:59 -0600 Subject: [PATCH] Bug 2523 - Audacity may suggest installing FFmpeg even when FFmpeg is installed --- src/import/Import.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/import/Import.cpp b/src/import/Import.cpp index e488fe58e..9b09e6ba6 100644 --- a/src/import/Import.cpp +++ b/src/import/Import.cpp @@ -49,6 +49,7 @@ ImportLOF.cpp, and ImportAUP.cpp. #include #include #include //for wxBoxSizer +#include "../FFmpeg.h" #include "../FileNames.h" #include "../ShuttleGui.h" #include "../Project.h" @@ -792,8 +793,11 @@ bool Importer::Import( AudacityProject &project, // we were not able to recognize the file type errorMessage = XO( /* i18n-hint: %s will be the filename */ -"Audacity did not recognize the type of the file '%s'.\nTry installing FFmpeg. For uncompressed files, also try File > Import > Raw Data.") - .Format( fName ); +"Audacity did not recognize the type of the file '%s'.\n\n%sFor uncompressed files, also try File > Import > Raw Data.") + .Format( fName, + !FFmpegLibsInst() + ? XO("Try installing FFmpeg.\n\n") + : XO("") ); } else {