procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix display disconnect when tooltip frame is alive

Browse source 
* src/xterm.c (x_connection_closed): Don't dereference nil when
loop finds a tooltip frame.
This commit is contained in:
Po Lu 2022-07-02 21:21:33 +08:00
parent e0488f89d1
commit 59d109b73c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/xterm.c
View file

@ -23280,6 +23280,7 @@ x_connection_closed (Display *dpy, const char *error_message, bool ioerror)
Emacs_XIOErrorHandler io_error_handler;
xm_drop_start_message dmsg;
struct frame *f;
Lisp_Object minibuf_frame, tmp;
dpyinfo = x_display_info_for_display (dpy);
error_msg = alloca (strlen (error_message) + 1);
@ -23379,9 +23380,14 @@ x_connection_closed (Display *dpy, const char *error_message, bool ioerror)
that are on the dead display. */
FOR_EACH_FRAME (tail, frame)
{
Lisp_Object minibuf_frame;
/* Tooltip frames don't have these, so avoid crashing. */
if (FRAME_TOOLTIP_P (XFRAME (frame)))
continue;
minibuf_frame
= WINDOW_FRAME (XWINDOW (FRAME_MINIBUF_WINDOW (XFRAME (frame))));
if (FRAME_X_P (XFRAME (frame))
&& FRAME_X_P (XFRAME (minibuf_frame))
&& ! EQ (frame, minibuf_frame)
@ -23432,11 +23438,8 @@ For details, see etc/PROBLEMS.\n",
/* We have just closed all frames on this display. */
emacs_abort ();
{
Lisp_Object tmp;
XSETTERMINAL (tmp, dpyinfo->terminal);
Fdelete_terminal (tmp, Qnoelisp);
}
XSETTERMINAL (tmp, dpyinfo->terminal);
Fdelete_terminal (tmp, Qnoelisp);
}
unblock_input ();