From f88b7f67ab63e0c1959cb67b58ae50e85b127c79 Mon Sep 17 00:00:00 2001 From: lllucius Date: Sun, 6 Mar 2011 20:30:10 +0000 Subject: [PATCH] Fix bug #141 and correct monolithic test. --- src/FFmpeg.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp index 73fa10c85..2b820b3da 100644 --- a/src/FFmpeg.cpp +++ b/src/FFmpeg.cpp @@ -99,12 +99,15 @@ void FFmpegStartup() bool enabled = false; gPrefs->Read(wxT("/FFmpeg/Enabled"),&enabled); // 'false' means that no errors should be shown whatsoever - if (enabled && !LoadFFmpeg(false)) + if (!LoadFFmpeg(false)) { - wxMessageBox(_("FFmpeg was configured in Preferences and successfully loaded before, \ - \nbut this time Audacity failed to load it at startup. \ - \n\nYou may want to go back to Preferences > Libraries and re-configure it."), - _("FFmpeg startup failed")); + if (enabled) + { + wxMessageBox(_("FFmpeg was configured in Preferences and successfully loaded before, \ + \nbut this time Audacity failed to load it at startup. \ + \n\nYou may want to go back to Preferences > Libraries and re-configure it."), + _("FFmpeg startup failed")); + } } } @@ -739,10 +742,9 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr) wxFileName actual; actual = FileNames::PathFromAddr(avformat->GetSymbol(wxT("avutil_version"))); - if (actual.GetPath().IsSameAs(name.GetPath())) { - + if (actual.GetFullPath().IsSameAs(name.GetFullPath())) { actual = FileNames::PathFromAddr(avformat->GetSymbol(wxT("avcodec_version"))); - if (actual.GetPath().IsSameAs(name.GetPath())) { + if (actual.GetFullPath().IsSameAs(name.GetFullPath())) { util = avformat; codec = avformat; }