From 79f55742d6ce46a189b4e3365a764a46440cd9a2 Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Thu, 20 Oct 2022 01:34:26 -0400 Subject: [PATCH] =?UTF-8?q?JACKAudioBackend::join=5Fprocess=5Fthreads:=20D?= =?UTF-8?q?on=E2=80=99t=20pass=20NULL=20for=20jack=5Fclient=5Fstop=5Fthrea?= =?UTF-8?q?d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for PipeWire’s JACK frontend, which implements this function and expects the first argument to be non-null. --- libs/backends/jack/jack_audiobackend.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index ba9f77e72f..e981212009 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -876,6 +876,8 @@ JACKAudioBackend::create_process_thread (boost::function f) int JACKAudioBackend::join_process_threads () { + GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1); + int ret = 0; for (std::vector::const_iterator i = _jack_threads.begin (); @@ -884,7 +886,7 @@ JACKAudioBackend::join_process_threads () #if defined(USING_JACK2_EXPANSION_OF_JACK_API) || defined __jack_systemdeps_h__ // jack_client is not used by JACK2's implementation // also jack_client_close() leaves threads active - if (jack_client_stop_thread (NULL, *i) != 0) + if (jack_client_stop_thread (_priv_jack, *i) != 0) #else void* status; if (pthread_join (*i, &status) != 0)