From 361324d4a244be7005598a2f071007ea0bb26ed3 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Fri, 14 Mar 2014 11:48:35 +0000
Subject: [PATCH] Misc

---
 source/plugin/Makefile                    |  2 +-
 source/plugin/carla-native-lv2-export.cpp |  2 +-
 source/plugin/carla-native-lv2.cpp        | 24 ++++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 3729df06c..0bd0aeecf 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -167,7 +167,7 @@ carla-native.lv2/carla-native.so: carla-native-lv2.cpp.o $(LIBS)
 # --------------------------------------------------------------
 
 .FORCE:
-.PHONY: .FORCE
+.PHONY: .FORCE carla-native-lv2-export
 
 ../backend/carla_engine_plugin.a: .FORCE
 	$(MAKE) -C ../backend/engine ../carla_engine_plugin.a
diff --git a/source/plugin/carla-native-lv2-export.cpp b/source/plugin/carla-native-lv2-export.cpp
index a96e9e9ef..6761dd93e 100644
--- a/source/plugin/carla-native-lv2-export.cpp
+++ b/source/plugin/carla-native-lv2-export.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/source/plugin/carla-native-lv2.cpp b/source/plugin/carla-native-lv2.cpp
index b67eb9c19..ae320c082 100644
--- a/source/plugin/carla-native-lv2.cpp
+++ b/source/plugin/carla-native-lv2.cpp
@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2013 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2013-2014 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -263,13 +263,14 @@ public:
             gActivePlugins.removeFirstMatchingValue(this);
 
             JUCE_AUTORELEASEPOOL
-
-            MessageManagerLock mmLock;
-
-            if (gActivePlugins.size() == 0)
             {
-                JuceMessageThread::deleteInstance();
-                shutdownJuce_GUI();
+                MessageManagerLock mmLock;
+
+                if (gActivePlugins.size() == 0)
+                {
+                    JuceMessageThread::deleteInstance();
+                    shutdownJuce_GUI();
+                }
             }
 
             fUiWasShown = false;
@@ -645,11 +646,12 @@ protected:
             if (fDescriptor->hints & PLUGIN_NEEDS_UI_JUCE)
             {
                 JUCE_AUTORELEASEPOOL
-
-                if (gActivePlugins.size() == 0)
                 {
-                    initialiseJuce_GUI();
-                    JuceMessageThread::getInstance();
+                    if (gActivePlugins.size() == 0)
+                    {
+                        initialiseJuce_GUI();
+                        JuceMessageThread::getInstance();
+                    }
                 }
 
                 fDescriptor->ui_show(fHandle, true);