xscreensaver-15-bug-6583181.diff revision 19033
6361N/A/*
6361N/A * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
6361N/A *
6361N/A * Permission is hereby granted, free of charge, to any person obtaining a
6361N/A * copy of this software and associated documentation files (the "Software"),
6361N/A * to deal in the Software without restriction, including without limitation
6361N/A * the rights to use, copy, modify, merge, publish, distribute, sublicense,
6361N/A * and/or sell copies of the Software, and to permit persons to whom the
6361N/A * Software is furnished to do so, subject to the following conditions:
29N/A *
6361N/A * The above copyright notice and this permission notice (including the next
6361N/A * paragraph) shall be included in all copies or substantial portions of the
6361N/A * Software.
6361N/A *
6361N/A * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
6361N/A * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6361N/A * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
6361N/A * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
6361N/A * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
6361N/A * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29N/A * DEALINGS IN THE SOFTWARE.
6361N/A */
6361N/A---
6361N/A driver/xscreensaver.c | 2 ++
6361N/A 1 files changed, 2 insertions(+), 0 deletions(-)
6361N/A
6361N/Adiff --git xscreensaver-5.12/driver/xscreensaver.c xscreensaver-5.12/driver/xscreensaver.c
6361N/A--- xscreensaver-5.12/driver/xscreensaver.c
6361N/A+++ xscreensaver-5.12/driver/xscreensaver.c
6361N/A@@ -1566,6 +1566,7 @@ main (int argc, char **argv)
6361N/A if (ssi->real_screen_p)
84N/A if (ensure_no_screensaver_running (si->dpy, si->screens[i].screen))
6361N/A exit (1);
6361N/A+ ssi->current_hack = -1; /* otherwise initialize hacks to no hack */
6361N/A }
6361N/A
6361N/A lock_initialization (si, &argc, argv);
6361N/A@@ -1600,6 +1601,7 @@ main (int argc, char **argv)
6361N/A
29N/A make_splash_dialog (si);
6361N/A
6361N/A+ store_saver_status(si); /* set window property for SCREENSAVER_STATUS */
6361N/A main_loop (si); /* doesn't return */
return 0;
}