From ae55ac91dc79db97b665fdd7daaaf5bcfe7f51ac Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Sun, 29 May 2016 10:02:40 -0700 Subject: [PATCH] x11-screen.scm: Fix DISPLAY test. --- src/x11-screen/x11-screen.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/x11-screen/x11-screen.scm b/src/x11-screen/x11-screen.scm index b5bb4e1ac..bc198af52 100644 --- a/src/x11-screen/x11-screen.scm +++ b/src/x11-screen/x11-screen.scm @@ -1314,7 +1314,10 @@ Otherwise, it is copied from the primary selection." ;; X-OPEN-DISPLAY hangs, uninterruptibly, when the X server is ;; running the login loop of xdm. Can this be fixed? (or x-display-data - (and (or x-display-name (get-environment-variable "DISPLAY")) + (and (or x-display-name + (let ((DISPLAY (get-environment-variable "DISPLAY"))) + (and (string? DISPLAY) + (not (string-null? DISPLAY))))) (plugin-available? "x11") (begin (load-option 'X11) -- 2.25.1