diff options
-rw-r--r-- | src/os_unix.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index e87331defc..eaf07f101a 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1742,8 +1742,8 @@ x_IOerror_handler(Display *dpy UNUSED) static void may_restore_clipboard(void) { - // Only try restoring if we want the connection. - if (x_connect_to_server() && xterm_dpy_retry_count > 0) + // No point in restoring the connecting if we are exiting or dying. + if (!exiting && !v_dying && xterm_dpy_retry_count > 0) { --xterm_dpy_retry_count; diff --git a/src/version.c b/src/version.c index a49edb709c..5852ce79e6 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 657, +/**/ 656, /**/ 655, |