From 89416523d1fab64208f669be939ffe5bdb1076dc Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 22 Sep 2018 22:54:20 +0200
Subject: [PATCH] libjack: fix for clients registering too early

---
 source/libjack/libjack.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/source/libjack/libjack.cpp b/source/libjack/libjack.cpp
index 714a87ee3..9816c4a5f 100644
--- a/source/libjack/libjack.cpp
+++ b/source/libjack/libjack.cpp
@@ -120,6 +120,7 @@ public:
           fMidiInBuffers(nullptr),
           fMidiOutBuffers(nullptr),
           fIsOffline(false),
+          fIsReady(false),
           fLastPingTime(-1),
           fSessionManager(0),
           fSetupHints(0),
@@ -194,6 +195,9 @@ public:
 
     JackClientState* createClient(const char* const name)
     {
+        while (fNonRealtimeThread.isThreadRunning() && ! fIsReady)
+            carla_sleep(1);
+
         return new JackClientState(fServer, name);
     }
 
@@ -285,6 +289,7 @@ private:
     char fBaseNameNonRtServerControl[6+1];
 
     bool fIsOffline;
+    volatile bool fIsReady;
     int64_t fLastPingTime;
 
     int fSessionManager;
@@ -390,17 +395,20 @@ bool CarlaJackAppClient::initSharedMemmory()
     fAudioTmpBuf = new float[fServer.bufferSize];
     carla_zeroFloats(fAudioTmpBuf, fServer.bufferSize);
 
-    // tell backend we're live
-    const CarlaMutexLocker _cml(fShmNonRtServerControl.mutex);
-
     fLastPingTime = getCurrentTimeMilliseconds();
     CARLA_SAFE_ASSERT(fLastPingTime > 0);
 
-    // ready!
-    fShmNonRtServerControl.writeOpcode(kPluginBridgeNonRtServerReady);
-    fShmNonRtServerControl.commitWrite();
-    fShmNonRtServerControl.waitIfDataIsReachingLimit();
+    {
+        // tell backend we're live
+        const CarlaMutexLocker _cml(fShmNonRtServerControl.mutex);
+
+        // ready!
+        fShmNonRtServerControl.writeOpcode(kPluginBridgeNonRtServerReady);
+        fShmNonRtServerControl.commitWrite();
+        fShmNonRtServerControl.waitIfDataIsReachingLimit();
+    }
 
+    fIsReady = true;
     return true;
 }