From: Gerd Möllmann <gerd.moellmann@gmail.com>
Date: Wed, 19 Feb 2025 07:05:56 +0000 (+0100)
Subject: Handle nil top frame (bug#76410)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b6766284f6d990014f17489c11ae58f9c599ccc;p=emacs.git

Handle nil top frame (bug#76410)

* src/frame.c (do_switch_frame): Don't assume that top_frame is always a
frame, it can be nil.

(cherry picked from commit 1194ebe3a71f97b0ce7c8dcc4edaf7b0f81fdc6f)
---

diff --git a/src/frame.c b/src/frame.c
index 5cf4f308ea5..d1c37f4e722 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1807,7 +1807,7 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
 
       /* When FRAME's root frame is not its terminal's top frame, make
 	 that root frame the new top frame of FRAME's terminal.  */
-      if (root_frame (f) != XFRAME (top_frame))
+      if (NILP (top_frame) || root_frame (f) != XFRAME (top_frame))
 	{
 	  struct frame *p = FRAME_PARENT_FRAME (f);