diff options
| author | Paul Eggert | 2014-06-09 07:50:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-06-09 07:50:57 -0700 |
| commit | f4454d5215837bdddec70d8a1e7a9a4b3e4d52bd (patch) | |
| tree | dfe67e686436a5d56b0861789bb742e00fdcc9d5 /src/sysdep.c | |
| parent | fd60bf6c902b47daadda6ebf442045dbe1328941 (diff) | |
| download | emacs-f4454d5215837bdddec70d8a1e7a9a4b3e4d52bd.tar.gz emacs-f4454d5215837bdddec70d8a1e7a9a4b3e4d52bd.zip | |
Fix core dump after a dropped X connection.
* sysdep.c (stuff_char): Don't abort merely because the selected frame
is dead, as we may be shutting down.
Fixes: debbugs:17704
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 2eedd1fc6cb..211a3bb706f 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -222,7 +222,9 @@ discard_tty_input (void) | |||
| 222 | void | 222 | void |
| 223 | stuff_char (char c) | 223 | stuff_char (char c) |
| 224 | { | 224 | { |
| 225 | if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) | 225 | if (! (FRAMEP (selected_frame) |
| 226 | && FRAME_LIVE_P (XFRAME (selected_frame)) | ||
| 227 | && FRAME_TERMCAP_P (XFRAME (selected_frame)))) | ||
| 226 | return; | 228 | return; |
| 227 | 229 | ||
| 228 | /* Should perhaps error if in batch mode */ | 230 | /* Should perhaps error if in batch mode */ |