summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-05-07 13:43:10 +0000
committerGerd Moellmann <gerd@gnu.org>2001-05-07 13:43:10 +0000
commit18f534df4dbd66cc5f076c1226d9951058487d77 (patch)
tree03534226351e0e3a890c9aa9bc88b86bc2a329fb
parent1d0533709cc8737e591620cfc89529a743f28011 (diff)
downloademacs-18f534df4dbd66cc5f076c1226d9951058487d77.tar.gz
(delete_kboard): Handle the case that selected_frame
has been deleted in the course of x_connection_closed.
-rw-r--r--src/keyboard.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index da1ce089b9d..e447211a277 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10032,9 +10032,11 @@ delete_kboard (kb)
*kbp = kb->next_kboard;
/* Prevent a dangling reference to KB. */
- if (kb == current_kboard)
+ if (kb == current_kboard
+ && FRAMEP (selected_frame)
+ && FRAME_LIVE_P (XFRAME (selected_frame)))
{
- current_kboard = SELECTED_FRAME ()->kboard;
+ current_kboard = XFRAME (selected_frame)->kboard;
if (current_kboard == kb)
abort ();
}