Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JackClient: Lock before killing client notification thread #889

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

JackClient: Lock before killing client notification thread #889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions common/JackClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,17 @@ int JackClient::Close()
int result = 0;

Deactivate();

assert(JackGlobals::fSynchroMutex);

// Channels is stopped first to avoid receiving notifications while closing
fChannel->Stop();
JackGlobals::fSynchroMutex->Lock();
fChannel->Stop();
JackGlobals::fSynchroMutex->Unlock();
// Then close client
fChannel->ClientClose(GetClientControl()->fRefNum, &result);

fChannel->Close();
assert(JackGlobals::fSynchroMutex);
JackGlobals::fSynchroMutex->Lock();
fSynchroTable[GetClientControl()->fRefNum].Disconnect();
JackGlobals::fSynchroMutex->Unlock();
Expand Down