From 367fbe8733249e4629976603a5d2fd4a692158c6 Mon Sep 17 00:00:00 2001 From: Dave French Date: Thu, 16 Jul 2015 12:51:34 +0100 Subject: [PATCH] The ConfigManager was Incorrectly loading Ladspa plugin folder. The default Ladspa plugin folder was incorrect under linux This pull request fixes this. Setting Dialog, Ladspa Directory Added leading / Added a leading / to the lmms/ladspa plugin Clean the path using QDir::cleanPath() --- src/core/ConfigManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index 3024a0646..3286976b8 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -369,16 +369,16 @@ void ConfigManager::loadConfigFile() m_flDir = ensureTrailingSlash( QDir::home().absolutePath() ); } - if( m_ladDir.isEmpty() || m_ladDir == QDir::separator() || - ( !m_ladDir.contains( ':' ) && !QDir( m_ladDir ).exists() ) ) + if( m_ladDir.isEmpty() ) { #if defined(LMMS_BUILD_WIN32) m_ladDir = qApp->applicationDirPath() + "/plugins/ladspa" + QDir::separator(); #elif defined(LMMS_BUILD_APPLE) m_ladDir = qApp->applicationDirPath() + "/../lib/lmms/ladspa/"; #else - m_ladDir = qApp->applicationDirPath() + '/' + LIB_DIR + "/ladspa/"; + m_ladDir = qApp->applicationDirPath() + '/' + LIB_DIR + "/lmms/ladspa/"; #endif + m_ladDir = QDir::cleanPath( m_ladDir ); m_ladDir += ","+userLadspaDir(); }