/*
 * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice (including the next
 * paragraph) shall be included in all copies or substantial portions of the
 * Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 */

diff -Nurp -x '*~' -x '*.orig' xscreensaver-5.01/driver/xscreensaver.c xscreensaver-5.01/driver/xscreensaver.c
--- xscreensaver-5.01/driver/xscreensaver.c	2009-05-27 17:25:00.040321000 -0700
+++ xscreensaver-5.01/driver/xscreensaver.c	2009-05-27 17:25:18.192245000 -0700
@@ -1550,6 +1550,7 @@ main (int argc, char **argv)
       if (ssi->real_screen_p)
         if (ensure_no_screensaver_running (si->dpy, si->screens[i].screen))
           exit (1);
+      ssi->current_hack = -1; /* otherwise initialize hacks to no hack */
     }
 
   lock_initialization (si, &argc, argv);
@@ -1585,6 +1586,7 @@ main (int argc, char **argv)
   make_splash_dialog (si);
   /*spawn_external_passwd_process (si);*/
 
+  store_saver_status(si); /* set window property for SCREENSAVER_STATUS */
   main_loop (si);		/* doesn't return */
   return 0;
 }