=== modified file 'src/frame.c'
--- src/frame.c	2012-01-19 07:21:25 +0000
+++ src/frame.c	2012-03-06 15:18:55 +0000
@@ -1143,14 +1143,15 @@
 	    }
 #endif
 
-	  if (FRAME_VISIBLE_P (XFRAME (this))
-	      || FRAME_ICONIFIED_P (XFRAME (this))
-	      /* Allow deleting the terminal frame when at least
-		 one X frame exists!  */
-	      || (FRAME_WINDOW_P (XFRAME (this)) && !FRAME_WINDOW_P (f)))
+	  if (f != XFRAME (this)
+	      && (FRAME_VISIBLE_P (XFRAME (this))
+		  || FRAME_ICONIFIED_P (XFRAME (this))
+		  /* Allow deleting the terminal frame when at least
+		     one X frame exists!  */
+		  || (FRAME_WINDOW_P (XFRAME (this)) && !FRAME_WINDOW_P (f))))
 	    count++;
 	}
-      return count > 1;
+      return count;
     }
   return 1;
 }