From 2a6086d9240a71fa34938208aa570c6fd3660179 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 8 Mar 2015 20:42:01 +0100 Subject: [PATCH] Fix debug build (on linux) --- data/linux/make-binary.sh | 2 +- source/utils/CarlaJuceEvents.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/linux/make-binary.sh b/data/linux/make-binary.sh index 003ff5995..7471761d3 100755 --- a/data/linux/make-binary.sh +++ b/data/linux/make-binary.sh @@ -6,7 +6,7 @@ if [ -f Makefile ]; then cd data/linux fi -VERSION="1.9.5~git20150307" +VERSION="1.9.5~git20150308" if [ ! -f carla-git-static_"$VERSION"_amd64.deb ]; then wget -c https://launchpad.net/~kxstudio-debian/+archive/ubuntu/testing/+files/carla-git-static_"$VERSION"_amd64.deb diff --git a/source/utils/CarlaJuceEvents.cpp b/source/utils/CarlaJuceEvents.cpp index 9b6fd444f..fb9eabd46 100644 --- a/source/utils/CarlaJuceEvents.cpp +++ b/source/utils/CarlaJuceEvents.cpp @@ -85,7 +85,7 @@ protected: } private: - bool fInitializing; + volatile bool fInitializing; CriticalSection fLock; ReferenceCountedArray fQueue; @@ -133,7 +133,9 @@ void MessageManager::doPlatformSpecificShutdown() { JuceEventsThread& juceEventsThread(getJuceEventsThreadInstance()); - if (! juceEventsThread.isInitializing()) + if (juceEventsThread.isInitializing()) + juceEventsThread.signalThreadShouldExit(); + else juceEventsThread.stopThread(-1); } @@ -143,6 +145,12 @@ bool MessageManager::postMessageToSystemQueue(MessageManager::MessageBase* const return juceEventsThread.postMessage(message); } +bool MessageManager::dispatchNextMessageOnSystemQueue(bool) +{ + carla_stderr2("MessageManager::dispatchNextMessageOnSystemQueue() unsupported"); + return false; +} + } // namespace juce #endif // ! CARLA_OS_MAC || CARLA_OS_WIN