1 files changed, 6 insertions, 5 deletions

diff --git a/src/frame.c b/src/frame.c
index 0b59b43a445..95f53569561 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1158,12 +1158,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
       FOR_EACH_FRAME (frames, this)
         {
           Lisp_Object fminiw;
-          struct frame *this_f;
 
-          if (! EQ (this, frame)
-              && (this_f = XFRAME (this))
-              && WINDOWP (fminiw = FRAME_MINIBUF_WINDOW (this_f))
-              && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw))))
+          if (EQ (this, frame))
+            continue;
+
+          fminiw = FRAME_MINIBUF_WINDOW (XFRAME (this));
+
+          if (WINDOWP (fminiw) && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw))))
             {
               /* If we MUST delete this frame, delete the other first.
                  But do this only if FORCE equals `noelisp'.  */