(x_delete_terminal): Use terminal->name as liveness status.

diff --git a/src/xfns.c b/src/xfns.c
index 14e5b058e3211b8f8d8bc5283bb19f945b53fe67..764cbbafa779e22fb42963b3b62ec2321b4e82e0 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3108,8 +3108,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
   kb = &the_only_kboard;
 #endif
 
-  if (dpyinfo->terminal->deleted)
-    error ("Terminal is being deleted, can't create new frames on it");
+  if (!dpyinfo->terminal->name)
+    error ("Terminal is not live, can't create new frames on it");
 
   name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
   if (!STRINGP (name)
@@ -4703,8 +4703,8 @@ x_create_tip_frame (dpyinfo, parms, text)
 
   check_x ();
 
-  if (dpyinfo->terminal->deleted)
-    error ("Terminal is being deleted, can't create new frames on it");
+  if (!dpyinfo->terminal->name)
+    error ("Terminal is not live, can't create new frames on it");
 
   parms = Fcopy_alist (parms);
 

diff --git a/src/xterm.c b/src/xterm.c
index 68f5b266810a7b3bded3deb7aeff2abf695f7d02..dc69af88a12fcd513d2173cd7d263f296f5b8852 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -11311,7 +11311,7 @@ x_delete_terminal (struct terminal *terminal)
 
   /* Protect against recursive calls.  Fdelete_frame in
      delete_terminal calls us back when it deletes our last frame.  */
-  if (terminal->deleted)
+  if (!terminal->name)
     return;
 
   BLOCK_INPUT;