summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Fourdan <fourdan@xfce.org>2018-12-01 21:12:58 +0100
committerOlivier Fourdan <fourdan@xfce.org>2018-12-03 09:33:18 +0100
commit600cb96c7eed28529fc8d5d0383d58070cb30957 (patch)
treea618b5652b2ab8a05ef2ec3c2a73099152c462a0
parent53903467b39efd8155c864b72099f25446e89eb5 (diff)
downloadxfwm4-xfce-4.12.tar.gz
compositor: Shaded windows have no heightxfce-4.12
Bug: 14899 Trying to get the pixmap with a height of zero will lead to an XError and further trouble down the line. Signed-off-by: Olivier Fourdan <fourdan@xfce.org> (cherry picked from commit 8cd915228bafb9792fd5d3e7e778db8ed51578d1)
-rw-r--r--src/compositor.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compositor.c b/src/compositor.c
index 5a7b7e0d2..fca15aed3 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2956,6 +2956,12 @@ compositorScaleWindowPixmap (CWindow *cw, guint *width, guint *height)
}
src_size = MAX (src_w, src_h);
+ /* Shaped windows have no height */
+ if (src_w == 0 || src_h == 0)
+ {
+ return None;
+ }
+
/*/
* Caller may pass either NULL or 0.
* If 0, we return the actual unscalled size.