* term.c (close_gpm): New fun extracted from Fgpm_mouse_stop.

(Fgpm_mouse_stop): Use it.
* termhooks.h (close_gpm): Declare.
* keyboard.c (tty_read_avail_input): Forcefully close the gpm
connection if Gpm_GetEvent fails.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/keyboard.c b/src/keyboard.c
index 5015155d97f..cd18b91abf1 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7110,6 +7110,9 @@ tty_read_avail_input (struct terminal *terminal,
       while (gpm = Gpm_GetEvent (&event), gpm == 1) {
           nread += handle_one_term_event (tty, &event, &hold_quit);
       }
+      if (gpm < 0)
+        /* Presumably the GPM daemon has closed the connection.  */
+        close_gpm ();
       if (hold_quit.kind != NO_EVENT)
           kbd_buffer_store_event (&hold_quit);
       if (nread)