From 3cab059038030afa8fccd3dde3016b8e0e49d2fe Mon Sep 17 00:00:00 2001 From: Steve Daulton Date: Mon, 21 Mar 2016 11:44:48 +0000 Subject: [PATCH] Tweak EQDefaultCurve update path and add log message to aid testing. --- src/effects/Equalization.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index b194d1119..427a786a3 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -1479,13 +1479,19 @@ void EffectEqualization::UpdateDefaultCurves(bool updateAll /* false */) EQCurveArray userCurves = mCurves; mCurves.Clear(); - wxFileName fn; + // We only wamt to look for the shipped EQDefaultCurves.xml + wxFileName fn = wxFileName(wxStandardPaths::Get().GetResourcesDir(), + wxT("EQDefaultCurves.xml")); + wxLogDebug(wxT("Attempting to load EQDefaultCurves.xml from %s"),wxStandardPaths::Get().GetResourcesDir().c_str()); XMLFileReader reader; - if(!GetDefaultFileName(fn) || !reader.Parse(this, fn.GetFullPath())) { + if(!reader.Parse(this, fn.GetFullPath())) { wxLogError(wxT("EQDefaultCurves.xml could not be read.")); return; } + else { + wxLogDebug(wxT("Loading EQDefaultCurves.xml successful.")); + } EQCurveArray defaultCurves = mCurves; mCurves.Clear(); // clear now so that we can sort then add back.