mirror of
https://github.com/glfw/glfw.git
synced 2024-11-12 17:51:48 +00:00
Wayland: Cancel display fd read before callbacks
Cancel the prepared-to-read state on the calling thread before starting
to call back to user code.
Emitting close requests here is not a good choice but that is for
a future commit to address.
(cherry picked from commit 203a7c59d2
)
This commit is contained in:
parent
7302a8f520
commit
9dd3f25d6d
@ -866,6 +866,8 @@ static void handleEvents(int timeout)
|
|||||||
// from the Wayland session; try to handle that the best we can.
|
// from the Wayland session; try to handle that the best we can.
|
||||||
if (!flushDisplay())
|
if (!flushDisplay())
|
||||||
{
|
{
|
||||||
|
wl_display_cancel_read(_glfw.wl.display);
|
||||||
|
|
||||||
_GLFWwindow* window = _glfw.windowListHead;
|
_GLFWwindow* window = _glfw.windowListHead;
|
||||||
while (window)
|
while (window)
|
||||||
{
|
{
|
||||||
@ -873,7 +875,6 @@ static void handleEvents(int timeout)
|
|||||||
window = window->next;
|
window = window->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
wl_display_cancel_read(_glfw.wl.display);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user