X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=utils%2Ffade.c;h=7a2ce2be92ab43ccaff9b0934198a4ada829bda3;hp=d3f7ca3aa051ff1e808f7768b27957cfc66ab5df;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hpb=50be9bb40dc60130c99ffa568e6677779904ff70

diff --git a/utils/fade.c b/utils/fade.c
index d3f7ca3a..7a2ce2be 100644
--- a/utils/fade.c
+++ b/utils/fade.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2008 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2011 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -900,6 +900,11 @@ xf86_whack_gamma(Display *dpy, int screen, xf86_gamma_info *info,
 {
   Bool status;
 
+  XErrorHandler old_handler;
+  XSync (dpy, False);
+  error_handler_hit_p = False;
+  old_handler = XSetErrorHandler (ignore_all_errors_ehandler);
+
   if (ratio < 0) ratio = 0;
   if (ratio > 1) ratio = 1;
 
@@ -947,7 +952,10 @@ xf86_whack_gamma(Display *dpy, int screen, xf86_gamma_info *info,
 # endif /* !HAVE_XF86VMODE_GAMMA_RAMP */
     }
 
-  XSync(dpy, False);
+  XSync (dpy, False);
+  XSetErrorHandler (old_handler);
+  XSync (dpy, False);
+
   return status;
 }