From ef38cd3483a58f6e822b5ae81c4b99b034be1a9a Mon Sep 17 00:00:00 2001 From: sletz Date: Sun, 29 Jan 2012 13:20:33 +0000 Subject: [PATCH] Correct JackMessageBuffer::SetInitCallback. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4746 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackMessageBuffer.cpp | 10 +++++++--- windows/JackWinProcessSync.cpp | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/common/JackMessageBuffer.cpp b/common/JackMessageBuffer.cpp index cf2aa5af..64382c66 100644 --- a/common/JackMessageBuffer.cpp +++ b/common/JackMessageBuffer.cpp @@ -44,8 +44,12 @@ JackMessageBuffer::~JackMessageBuffer() bool JackMessageBuffer::Start() { - fRunning = true; - return fThread.StartSync(); + if (fThread.StartSync() == 0) { + fRunning = true; + return true; + } else { + return false; + } } bool JackMessageBuffer::Stop() @@ -157,7 +161,7 @@ void JackMessageBufferAdd(int level, const char *message) void JackMessageBuffer::SetInitCallback(JackThreadInitCallback callback, void *arg) { - if (fInstance && fGuard.Lock()) { + if (fInstance && fInit && fGuard.Lock()) { /* set up the callback */ fInitArg = arg; fInit = callback; diff --git a/windows/JackWinProcessSync.cpp b/windows/JackWinProcessSync.cpp index c7625554..40ff26d5 100644 --- a/windows/JackWinProcessSync.cpp +++ b/windows/JackWinProcessSync.cpp @@ -134,8 +134,9 @@ bool JackWinProcessSync::LockedTimedWait(long usec) HANDLE handles[] = { fMutex, fEvent }; DWORD res = WaitForMultipleObjects(2, handles, true, usec / 1000); - if ((res != WAIT_OBJECT_0) && (res != WAIT_TIMEOUT)) - jack_error("ackWinProcessSync::LockedTimedWait WaitForMultipleObjects err = %d", GetLastError()); + if ((res != WAIT_OBJECT_0) && (res != WAIT_TIMEOUT)) { + jack_error("JackWinProcessSync::LockedTimedWait WaitForMultipleObjects err = %d", GetLastError()); + } if (!ResetEvent(fEvent)) { jack_error("JackWinProcessSync::LockedTimedWait ResetEvent err = %d", GetLastError());