From 90a868aba690613cca90a93bfc6a6edd8d32dc60 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 2 Jun 2020 14:30:38 +0100
Subject: [PATCH] Fix bridge build

Signed-off-by: falkTX <falktx@falktx.com>
---
 source/backend/engine/CarlaEngineClient.cpp   | 4 +++-
 source/backend/engine/CarlaEngineInternal.cpp | 3 ++-
 source/backend/engine/CarlaEngineJack.cpp     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/backend/engine/CarlaEngineClient.cpp b/source/backend/engine/CarlaEngineClient.cpp
index 70be90b8f..308533899 100644
--- a/source/backend/engine/CarlaEngineClient.cpp
+++ b/source/backend/engine/CarlaEngineClient.cpp
@@ -111,7 +111,9 @@ CarlaEngineClient::ProtectedData::ProtectedData(const CarlaEngine& eng) noexcept
 CarlaEngineClient::ProtectedData::~ProtectedData()
 {
     carla_debug("CarlaEngineClient::ProtectedData::~ProtectedData()");
+#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
     CARLA_SAFE_ASSERT(plugin == nullptr);
+#endif
 }
 
 void CarlaEngineClient::ProtectedData::addAudioPortName(const bool isInput, const char* const name)
@@ -197,8 +199,8 @@ void CarlaEngineClient::deactivate(const bool willClose) noexcept
     {
 #ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
         pData->cvSourcePorts.setGraphAndPlugin(nullptr, nullptr);
-#endif
         pData->plugin = nullptr;
+#endif
     }
 }
 
diff --git a/source/backend/engine/CarlaEngineInternal.cpp b/source/backend/engine/CarlaEngineInternal.cpp
index 90f8a063f..422a57839 100644
--- a/source/backend/engine/CarlaEngineInternal.cpp
+++ b/source/backend/engine/CarlaEngineInternal.cpp
@@ -413,7 +413,8 @@ CarlaEngine::ProtectedData::ProtectedData(CarlaEngine* const engine)
       nextAction()
 {
 #ifdef BUILD_BRIDGE_ALTERNATIVE_ARCH
-    carla_zeroStructs(plugins, 1);
+    plugins[0].plugin = nullptr;
+    carla_zeroStructs(plugins[0].peaks, 1);
 #endif
 }
 
diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp
index 74ab6b9c8..d50e0dbad 100644
--- a/source/backend/engine/CarlaEngineJack.cpp
+++ b/source/backend/engine/CarlaEngineJack.cpp
@@ -927,13 +927,13 @@ public:
             } catch(...) {}
         }
 
+#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
         if (willClose)
         {
             fCVSourcePorts.setGraphAndPlugin(nullptr, nullptr);
-#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
             fReservedPluginPtr = nullptr;
-#endif
         }
+#endif
 
         CarlaEngineClient::deactivate(willClose);
     }