mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Linux: Release X lock when unregistering file descriptor in order to avoid deadlocks

Browse source
This commit is contained in:
reuk 2021-10-20 20:27:58 +01:00
parent e4a7978621
commit bd0ca90952
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.cpp
View file

@ -3198,17 +3198,22 @@ void XWindowSystem::destroyXDisplay()
{
jassert (display != nullptr);
XWindowSystemUtilities::ScopedXLock xLock;
{
XWindowSystemUtilities::ScopedXLock xLock;
X11Symbols::getInstance()->xDestroyWindow (display, juce_messageWindowHandle);
juce_messageWindowHandle = 0;
X11Symbols::getInstance()->xSync (display, True);
X11Symbols::getInstance()->xDestroyWindow (display, juce_messageWindowHandle);
juce_messageWindowHandle = 0;
X11Symbols::getInstance()->xSync (display, True);
}
LinuxEventLoop::unregisterFdCallback (X11Symbols::getInstance()->xConnectionNumber (display));
X11Symbols::getInstance()->xCloseDisplay (display);
display = nullptr;
displayVisuals = nullptr;
{
XWindowSystemUtilities::ScopedXLock xLock;
X11Symbols::getInstance()->xCloseDisplay (display);
display = nullptr;
displayVisuals = nullptr;
}
}
}