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

[xscreensaver] / utils / grabscreen.c

diff --git a/utils/grabscreen.c b/utils/grabscreen.c
index 78c21163fe7877b757b603ceee9a0798f3e2b9d9..3919457c7b5a5c6e6b7a72c9972fe50942cffe6f 100644 (file)
--- a/utils/grabscreen.c
+++ b/utils/grabscreen.c
@@ -1,5 +1,5 @@
 /* xscreensaver, Copyright (c) 1992, 1993, 1994, 1997, 1998
- *  Jamie Zawinski <jwz@netscape.com>
+ *  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
@@ -132,7 +132,10 @@ BadWindow_ehandler (Display *dpy, XErrorEvent *error)
   if (error->error_code == BadWindow || error->error_code == BadDrawable)
     return 0;
   else if (!old_ehandler)
-    abort();
+    {
+      abort();
+      return 0;
+    }
   else
     return (*old_ehandler) (dpy, error);
 }
@@ -245,7 +248,8 @@ grab_screen_image_1 (Screen *screen, Window window)
     XWindowAttributes xgwa2;
     XGetWindowAttributes (dpy, window, &xgwa2);
     fprintf(stderr, "%s: ", progname);
-    describe_visual(stderr, screen, xgwa2.visual);
+    describe_visual(stderr, screen, xgwa2.visual, ####);
+    fprintf (stderr, "\n");
   }
 #endif /* DEBUG */