* xfns.c (Fx_hide_tip): Check FRAME_LIVE_P (f) before calling xg_hide_tooltip.

2 files changed, 2 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1275b4a8def..7e8959d4b61 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
         * xfns.c (x_defined_color): If USE_GTK, call xg_check_special_colors
         first.
+        (Fx_hide_tip): Check FRAME_LIVE_P (f) before calling xg_hide_tooltip.
 
         * gtkutil.h (xg_check_special_colors): Declare.
 
diff --git a/src/xfns.c b/src/xfns.c
index 8544d9e3e10..e2d571a847f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5237,7 +5237,7 @@ Value is t if tooltip was open, nil otherwise.  */)
   /* When using system tooltip, tip_frame is the Emacs frame on which
      the tip is shown.  */
   f = XFRAME (frame);
-  if (xg_hide_tooltip (f))
+  if (FRAME_LIVE_P (f) && xg_hide_tooltip (f))
     frame = Qnil;
 #endif