From 969ade1ef6d9dc43af40d0cd596f7c6e61049430 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Thu, 13 Sep 2012 16:29:45 +0100
Subject: [PATCH] Carla: Don't init Lv2World when not neded, fixes discovery
 duplicate errors

---
 c++/carla-backend/lv2.cpp      | 2 ++
 c++/carla-includes/carla_lv2.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/c++/carla-backend/lv2.cpp b/c++/carla-backend/lv2.cpp
index 8fdb9de..069aab1 100644
--- a/c++/carla-backend/lv2.cpp
+++ b/c++/carla-backend/lv2.cpp
@@ -457,6 +457,8 @@ public:
             lv2Options.oSampleRate.type    = CARLA_URI_MAP_ID_ATOM_DOUBLE;
             lv2Options.oSampleRate.value   = &lv2Options.sampleRate;
         }
+
+        Lv2World.init();
     }
 
     ~Lv2Plugin()
diff --git a/c++/carla-includes/carla_lv2.h b/c++/carla-includes/carla_lv2.h
index 86c9bc9..0ebb94a 100644
--- a/c++/carla-includes/carla_lv2.h
+++ b/c++/carla-includes/carla_lv2.h
@@ -328,7 +328,6 @@ static inline
 const LV2_RDF_Descriptor* lv2_rdf_new(const LV2_URI URI)
 {
     Q_ASSERT(URI);
-    Lv2World.init();
 
     Lilv::Plugins lilvPlugins = Lv2World.get_all_plugins();