5559N/AFrom 4ac5532cc951b30058a1b271a7756391cd02a7a8 Mon Sep 17 00:00:00 2001

5559N/AFrom: Alan Coopersmith <alan.coopersmith@oracle.com>

5559N/ADate: Sat, 2 Jan 2016 22:54:22 -0800

5559N/ASubject: [PATCH] bug 15411287

5559N/A

5398N/A15411287 SUNBT6583181 SCREENSAVER_STATUS needs to be set up correctly at startup

5398N/A

5398N/AUpstream applicability & status unknown.

5398N/A---

5559N/A driver/xscreensaver.c | 2 ++

5559N/A 1 file changed, 2 insertions(+)

5398N/A

5398N/Adiff --git a/driver/xscreensaver.c b/driver/xscreensaver.c

5559N/Aindex 5f4ecb2..926fc63 100644

5398N/A--- a/driver/xscreensaver.c

5398N/A+++ b/driver/xscreensaver.c

5559N/A@@ -1669,6 +1669,7 @@ main (int argc, char **argv)

5398N/A if (ssi->real_screen_p)

5398N/A if (ensure_no_screensaver_running (si->dpy, si->screens[i].screen))

5398N/A exit (1);

5398N/A+ ssi->current_hack = -1; /* otherwise initialize hacks to no hack */

5398N/A }

5398N/A

5398N/A lock_initialization (si, &argc, argv);

5559N/A@@ -1700,6 +1701,7 @@ main (int argc, char **argv)

5398N/A

5398N/A make_splash_dialog (si);

5398N/A

5398N/A+ store_saver_status(si); /* set window property for SCREENSAVER_STATUS */

5398N/A main_loop (si); /* doesn't return */

5398N/A return 0;

5398N/A }

5559N/A--

5559N/A2.6.1

5559N/A