1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00

Partial fix for bug #807

The value in audacity.cfg is now prepended to the PATH
variable instead of appending it, so that directory
should be searched first.

It doesn't do fallback searches if the first attempt
fails.
This commit is contained in:
lllucius 2014-12-28 10:12:43 +00:00
parent c305724561
commit 51d69fc34b

View File

@ -739,15 +739,15 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool WXUNUSED(showerr))
if (!syspath.Contains(fmtdirsc) && !syspath.Contains(scfmtdir) && !syspath.Contains(fmtdir))
{
wxLogWarning(wxT("FFmpeg directory '%s' is not in PATH."), fmtdir.c_str());
if (syspath.Last() == wxT(';'))
if (syspath.Left(1) == wxT(';'))
{
wxLogMessage(wxT("Temporarily appending '%s' to PATH..."), fmtdir.c_str());
syspath.Append(fmtdirsc);
wxLogMessage(wxT("Temporarily preending '%s' to PATH..."), fmtdir.c_str());
syspath.Prepend(scfmtdir);
}
else
{
wxLogMessage(wxT("Temporarily appending '%s' to PATH..."), scfmtdir.c_str());
syspath.Append(scfmtdir);
wxLogMessage(wxT("Temporarily prepending '%s' to PATH..."), scfmtdir.c_str());
syspath.Prepend(fmtdirsc);
}
if (wxSetEnv(wxT("PATH"),syspath.c_str()))