mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-21 05:33:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dont-hang-when-wl-connection-is-broken'

Browse source 
Closes #651
This commit is contained in:
Daniel Eklöf 2021-07-25 10:14:15 +02:00
commit 7db8e06f55
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -48,6 +48,8 @@
* Crash in scrollback search mode when selection has been canceled due * Crash in scrollback search mode when selection has been canceled due
to terminal content updates to terminal content updates
(https://codeberg.org/dnkl/foot/issues/644). (https://codeberg.org/dnkl/foot/issues/644).
* Foot process not terminating when the Wayland connection is broken
(https://codeberg.org/dnkl/foot/issues/651).
### Security ### Security

10
wayland.c
View file

@ -1163,7 +1163,15 @@ fdm_wayl(struct fdm *fdm, int fd, int events, void *data)
if (events & EPOLLHUP) { if (events & EPOLLHUP) {
LOG_WARN("disconnected from Wayland"); LOG_WARN("disconnected from Wayland");
wl_display_cancel_read(wayl->display); /*
* Do *not* call wl_display_cancel_read() here.
*
* Doing so causes later calls to wayl_roundtrip() (called
* from term_destroy() -> wayl_win_destroy()) to hang
* indefinitely.
*
* https://codeberg.org/dnkl/foot/issues/651
*/
return false; return false;
} }