From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 4 Sep 2018 06:53:49 +0000 (+0200)
Subject: Don't call XGetGeometry for frames without outer X window (Bug#32615)
X-Git-Tag: emacs-26.1.90~172
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57bcdc76e0518f53cd171c76e726e6bdf646bf9a;p=emacs.git

Don't call XGetGeometry for frames without outer X window (Bug#32615)

* src/xfns.c (frame_geometry): Don't call XGetGeometry when
FRAME has no outer X window; return nil instead.  (Bug#32615)
---

diff --git a/src/xfns.c b/src/xfns.c
index 3da853ede8a..1381fee57ee 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5054,7 +5054,7 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute)
   int menu_bar_height = 0, menu_bar_width = 0;
   int tool_bar_height = 0, tool_bar_width = 0;
 
-  if (FRAME_INITIAL_P (f) || !FRAME_X_P (f))
+  if (FRAME_INITIAL_P (f) || !FRAME_X_P (f) || !FRAME_OUTER_WINDOW (f))
     return Qnil;
 
   block_input ();