From 8b65ae37b4c9b9b9286b180b1b1b31f5d7ba44d4 Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Tue, 3 Nov 2015 20:43:01 +0100
Subject: [PATCH] ConfigManager: Move plugin:ladspa init to LadspaManager

---
 src/core/ConfigManager.cpp | 3 +--
 src/core/LadspaManager.cpp | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index 374659102..114a12202 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -448,8 +448,7 @@ void ConfigManager::loadConfigFile()
 
 	if( m_ladDir.isEmpty()  )
 	{
-		m_ladDir = "plugins:ladspa/";
-		m_ladDir = ","+userLadspaDir();
+		m_ladDir = userLadspaDir();
 	}
 
 #ifdef LMMS_HAVE_STK
diff --git a/src/core/LadspaManager.cpp b/src/core/LadspaManager.cpp
index f21c00e47..cd3fee9ac 100644
--- a/src/core/LadspaManager.cpp
+++ b/src/core/LadspaManager.cpp
@@ -47,6 +47,7 @@ LadspaManager::LadspaManager()
 								split( LADSPA_PATH_SEPERATOR );
 	ladspaDirectories += ConfigManager::inst()->ladspaDir().split( ',' );
 
+	ladspaDirectories.push_back( "plugins:ladspa" );
 #ifndef LMMS_BUILD_WIN32
 	ladspaDirectories.push_back( qApp->applicationDirPath() + '/' + LIB_DIR + "ladspa" );
 	ladspaDirectories.push_back( "/usr/lib/ladspa" );