# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 989242990 0
# Node ID df85a76987bb1ba5ae688e56c18debd12194d895
# Parent  cf908fe10fe50f6a75592f46d3ad79f1b985ee79
(delete_kboard): Handle the case that selected_frame
has been deleted in the course of x_connection_closed.

diff -r cf908fe10fe5 -r df85a76987bb src/keyboard.c
--- a/src/keyboard.c	Mon May 07 11:27:36 2001 +0000
+++ b/src/keyboard.c	Mon May 07 13:43:10 2001 +0000
@@ -10032,9 +10032,11 @@
   *kbp = kb->next_kboard;
 
   /* Prevent a dangling reference to KB.  */
-  if (kb == current_kboard)
-    {
-      current_kboard = SELECTED_FRAME ()->kboard;
+  if (kb == current_kboard
+      && FRAMEP (selected_frame)
+      && FRAME_LIVE_P (XFRAME (selected_frame)))
+    {
+      current_kboard = XFRAME (selected_frame)->kboard;
       if (current_kboard == kb)
 	abort ();
     }