We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Updated patch to fix the issue

close-fix-v2.txt (text/plain), 2.01 KB, created by M Stoeckl on 2019-08-04 02:02:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: M Stoeckl

Created: 2019-08-04 02:02:09 UTC

Size: 2.01 KB

patch

obsolete

>diff -r a7eb3fe5cc41 src/video/wayland/SDL_waylandevents.c
>--- a/src/video/wayland/SDL_waylandevents.c	Tue Jun 25 11:47:02 2019 +0300
>+++ b/src/video/wayland/SDL_waylandevents.c	Sat Aug 03 21:58:39 2019 -0400
>@@ -177,15 +177,23 @@
> Wayland_PumpEvents(_THIS)
> {
>     SDL_VideoData *d = _this->driverdata;
>+    int err;
> 
>     WAYLAND_wl_display_flush(d->display);
> 
>     if (SDL_IOReady(WAYLAND_wl_display_get_fd(d->display), SDL_FALSE, 0)) {
>-        WAYLAND_wl_display_dispatch(d->display);
>+        err = WAYLAND_wl_display_dispatch(d->display);
>+    } else {
>+        err = WAYLAND_wl_display_dispatch_pending(d->display);
>     }
>-    else
>-    {
>-        WAYLAND_wl_display_dispatch_pending(d->display);
>+    if (err == -1 && !d->display_disconnected) {
>+        /* Something has failed with the Wayland connection -- for example,
>+         * the compositor may have shut down and closed its end of the socket,
>+         * or there is a library-specific error. No recovery is possible. */
>+        d->display_disconnected = 1;
>+        /* Only send a single quit message, as application shutdown might call
>+         * SDL_PumpEvents */
>+        SDL_SendQuit();
>     }
> }
> 
>diff -r a7eb3fe5cc41 src/video/wayland/SDL_waylandvideo.c
>--- a/src/video/wayland/SDL_waylandvideo.c	Tue Jun 25 11:47:02 2019 +0300
>+++ b/src/video/wayland/SDL_waylandvideo.c	Sat Aug 03 21:58:39 2019 -0400
>@@ -428,6 +428,7 @@
>     if (data->display == NULL) {
>         return SDL_SetError("Failed to connect to a Wayland display");
>     }
>+    data->display_disconnected = 0;
> 
>     data->registry = wl_display_get_registry(data->display);
>     if (data->registry == NULL) {
>diff -r a7eb3fe5cc41 src/video/wayland/SDL_waylandvideo.h
>--- a/src/video/wayland/SDL_waylandvideo.h	Tue Jun 25 11:47:02 2019 +0300
>+++ b/src/video/wayland/SDL_waylandvideo.h	Sat Aug 03 21:58:39 2019 -0400
>@@ -48,6 +48,7 @@
> 
> typedef struct {
>     struct wl_display *display;
>+    int display_disconnected;
>     struct wl_registry *registry;
>     struct wl_compositor *compositor;
>     struct wl_shm *shm;

Actions: View | Diff

Attachments on bug 4689: 3841 | 3920

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.