X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver.c;h=f3f43a772747a098742b86cb6cf9ec0659126aae;hp=7f4b0bd8a816a99b39582ba3c61248fc34ac85ce;hb=0bd2eabab3e404c6769fe8f59b639275e960c415;hpb=c6b273ef7292ba10943694df1656b05203d7b62f

diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c
index 7f4b0bd8..f3f43a77 100644
--- a/driver/xscreensaver.c
+++ b/driver/xscreensaver.c
@@ -659,23 +659,23 @@ initialize (saver_info *si, int argc, char **argv)
 #ifdef NO_LOCKING
   si->locking_disabled_p = True;
   si->nolock_reason = "not compiled with locking support";
-#else
+#else  /* !NO_LOCKING */
   si->locking_disabled_p = False;
 
-#ifdef SCO
+# ifdef SCO
   set_auth_parameters(argc, argv);
-#endif
+# endif /* SCO */
 
   if (! lock_init (argc, argv))	/* before hack_uid() for proper permissions */
     {
       si->locking_disabled_p = True;
       si->nolock_reason = "error getting password";
     }
-#endif
+#endif  /* !NO_LOCKING */
 
 #ifndef NO_SETUID
   hack_uid (si);
-#endif
+#endif /* NO_SETUID */
 
   progclass = "XScreenSaver";
 
@@ -704,6 +704,8 @@ initialize (saver_info *si, int argc, char **argv)
     if (ensure_no_screensaver_running (si->dpy, si->screens[i].screen))
       exit (1);
 
+  hack_environment (si);
+
   si->demo_mode_p = initial_demo_mode_p;
   srandom ((int) time ((time_t *) 0));