From e49cb96073f514edbe1b7a9854b49c47af35463c Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 12 Aug 2012 04:53:15 +0000
Subject: Fix memory leaks.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4667 a436a847-0d15-0410-975c-d299462d15a1
---
 src/server/NodeFactory.cpp | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'src/server/NodeFactory.cpp')

diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index 616a1b35..1544b98b 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -57,9 +57,11 @@ NodeFactory::~NodeFactory()
 const NodeFactory::Plugins&
 NodeFactory::plugins()
 {
+	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
 	if (!_has_loaded) {
 		// TODO: Plugin list refreshing
-		load_plugins();
+		load_lv2_plugins();
+		_has_loaded = true;
 	}
 	return _plugins;
 }
@@ -72,22 +74,6 @@ NodeFactory::plugin(const Raul::URI& uri)
 	return ((i != _plugins.end()) ? i->second : NULL);
 }
 
-void
-NodeFactory::load_plugins()
-{
-	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
-
-	// Only load if we havn't already, so every client connecting doesn't cause
-	// this (expensive!) stuff to happen.  Not the best solution - would be nice
-	// if clients could refresh plugins list for whatever reason :/
-	if (!_has_loaded) {
-		_plugins.clear();
-		load_internal_plugins();
-		load_lv2_plugins();
-		_has_loaded = true;
-	}
-}
-
 void
 NodeFactory::load_internal_plugins()
 {
-- 
cgit v1.2.1