Merge jackaudio/develop into LADI/main

* Fix deadlock with pthread_cond_timedwait() (by Florian Walpen)
This commit is contained in:
Nedko Arnaudov 2023-12-20 12:42:32 +02:00
commit ebb23d5ad6
1 changed files with 1 additions and 1 deletions

View File

@ -122,7 +122,7 @@ bool JackPosixProcessSync::TimedWait(long usec)
time.tv_nsec = (next_date_usec % 1000000) * 1000;
res = pthread_cond_timedwait(&fCond, &fMutex, &time);
if (res != 0) {
if (res != 0 && res != ETIMEDOUT) {
jack_error("JackPosixProcessSync::TimedWait error usec = %ld err = %s", usec, strerror(res));
} else {
fOwner = pthread_self();