blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

GHOST/Wayland: report a message when there is a fatal error 

Help troubleshooting T100855.
This commit is contained in:
Campbell Barton 2022-11-10 16:50:59 +11:00
parent 4b6d58fd6d
commit 2a6a492a82
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@ -1157,6 +1157,18 @@ static void gwl_registry_entry_update_all(GWL_Display *display, const int interf
/** \name Private Utility Functions
* \{ */
static void ghost_wl_display_report_error(struct wl_display *display)
{
int ecode = wl_display_get_error(display);
GHOST_ASSERT(ecode, "Error not set!");
if ((ecode == EPIPE || ecode == ECONNRESET)) {
fprintf(stderr, "The Wayland connection broke. Did the Wayland compositor die?\n");
}
else {
fprintf(stderr, "The Wayland connection experienced a fatal error: %s\n", strerror(ecode));
}
}
/**
* Callback for WAYLAND to run when there is an error.
*
@ -5152,10 +5164,14 @@ bool GHOST_SystemWayland::processEvents(bool waitForEvent)
#endif /* WITH_INPUT_NDOF */
if (waitForEvent) {
wl_display_dispatch(display_->wl_display);
if (wl_display_dispatch(display_->wl_display) == -1) {
ghost_wl_display_report_error(display_->wl_display);
}
}
else {
wl_display_roundtrip(display_->wl_display);
if (wl_display_roundtrip(display_->wl_display) == -1) {
ghost_wl_display_report_error(display_->wl_display);
}
}
if (getEventManager()->getNumEvents() > 0) {