http://ftp.x.org/contrib/applications/xscreensaver-2.21.tar.gz

[xscreensaver] / hacks / xlockmore.c

diff --git a/hacks/xlockmore.c b/hacks/xlockmore.c
index d7185de9c9e88c39e198dac33a4e05c4dac81f3f..f84f4919a6c3448734bea58c60348d5629bd430f 100644 (file)
--- a/hacks/xlockmore.c
+++ b/hacks/xlockmore.c
@@ -1,5 +1,5 @@
 /* xlockmore.c --- xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997 Jamie Zawinski <jwz@netscape.com>
+ * xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@netscape.com>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -75,7 +75,7 @@ pre_merge_options (void)
              new->value = "True";
              new = &options[i++];
              new->option = "-no-wireframe";
-             new->specifier = options[i-1].specifier;
+             new->specifier = options[i-2].specifier;
              new->argKind = XrmoptionNoArg;
              new->value = "False";
            }
@@ -86,7 +86,7 @@ pre_merge_options (void)
              new->value = "True";
              new = &options[i++];
              new->option = "-no-3d";
-             new->specifier = options[i-1].specifier;
+             new->specifier = options[i-2].specifier;
              new->argKind = XrmoptionNoArg;
              new->value = "False";
            }
@@ -197,6 +197,7 @@ xlockmore_screenhack (Display *dpy, Window window,
   XColor color;
   int i;
   time_t start, now;
+  int orig_pause;
 
   memset(&mi, 0, sizeof(mi));
   mi.dpy = dpy;
@@ -321,6 +322,7 @@ xlockmore_screenhack (Display *dpy, Window window,
     mi.pause = 0;
   else if (mi.pause > 100000000)
     mi.pause = 100000000;
+  orig_pause = mi.pause;
 
   xlockmore_read_resources ();
 
@@ -335,6 +337,7 @@ xlockmore_screenhack (Display *dpy, Window window,
     XSync(dpy, False);
     if (mi.pause)
       usleep(mi.pause);
+    mi.pause = orig_pause;
 
     if (hack_free)
       {