From e34bba1b8b14bd4a567c94c21deb817ad932a948 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Mon, 9 Jul 2018 15:02:42 +0000
Subject: Source the Xsetup script before initializing the greeter widget.

Based on a request by weerd@, tested by jca@ and weerd@
---
 greeter/greet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/greeter/greet.c b/greeter/greet.c
index dfd0687..51dec78 100644
--- a/greeter/greet.c
+++ b/greeter/greet.c
@@ -301,13 +301,13 @@ greet_user_rtn GreetUser(
     Arg		arglist[2];
     Display    *dpy;
 
-    dpy = InitGreet (d);
     /*
      * Run the setup script - note this usually will not work when
      * the server is grabbed, so we don't even bother trying.
      */
     if (!d->grabServer)
 	SetupDisplay (d);
+    dpy = InitGreet (d);
     if (!dpy) {
 	LogError ("Cannot reopen display %s for greet window\n", d->name);
 	exit (RESERVER_DISPLAY);
-- 
cgit v1.2.3