From 2a641b7c8a5cd3e77a0b2fee228307a4747240c5 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 23 Feb 2013 07:16:22 +0000
Subject: [PATCH] misc changes

---
 source/backend/plugin/CarlaPlugin.cpp      | 5 ++++-
 source/backend/plugin/FluidSynthPlugin.cpp | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index 3bf145e08..4cddec91a 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -586,7 +586,10 @@ void CarlaPlugin::setCtrlChannel(const int8_t channel, const bool sendOsc, const
 
     if (kData->ctrlChannel != channel)
     {
-        kData->ctrlChannel = channel;
+        {
+            const ScopedProcessLocker spl(this, true);
+            kData->ctrlChannel = channel;
+        }
 
 #ifndef BUILD_BRIDGE
         const float ctrlf = channel;
diff --git a/source/backend/plugin/FluidSynthPlugin.cpp b/source/backend/plugin/FluidSynthPlugin.cpp
index a27255ea1..188f30715 100644
--- a/source/backend/plugin/FluidSynthPlugin.cpp
+++ b/source/backend/plugin/FluidSynthPlugin.cpp
@@ -914,7 +914,6 @@ public:
             bool allNotesOffSent = false;
 
             uint32_t time, nEvents = kData->event.portIn->getEventCount();
-            uint32_t startTime  = 0;
             uint32_t timeOffset = 0;
 
             uint32_t nextBankIds[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0 };
@@ -942,8 +941,6 @@ public:
                         if (kData->midiprog.current >= 0 && kData->midiprog.count > 0 && kData->ctrlChannel >= 0 && kData->ctrlChannel < 16)
                             nextBankIds[kData->ctrlChannel] = kData->midiprog.data[kData->midiprog.current].bank;
                     }
-                    else
-                        startTime += timeOffset;
                 }
 
                 // Control change