X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver-getimage.c;h=7b8919774ae422c63b7d3534ae2ad9dc1cc28522;hp=67b59d0656be830aa2082bd494de4a1e79c1e174;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38 diff --git a/driver/xscreensaver-getimage.c b/driver/xscreensaver-getimage.c index 67b59d06..7b891977 100644 --- a/driver/xscreensaver-getimage.c +++ b/driver/xscreensaver-getimage.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2001, 2002, 2003 by Jamie Zawinski +/* xscreensaver, Copyright (c) 2001-2004 by Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -180,7 +180,7 @@ root_window_p (Screen *screen, Window window) Atom type; int format; unsigned long nitems, bytesafter; - char *version; + unsigned char *version; if (window != RootWindowOfScreen (screen)) return False; @@ -189,7 +189,7 @@ root_window_p (Screen *screen, Window window) XInternAtom (dpy, "_SCREENSAVER_VERSION", False), 0, 1, False, XA_STRING, &type, &format, &nitems, &bytesafter, - (unsigned char **) &version) + &version) == Success && type != None) return False; @@ -1479,8 +1479,7 @@ get_image (Screen *screen, video_p = False; image_p = True; } - - if (!dir || !*dir) + else if (!dir || !*dir) { if (verbose_p && image_p) fprintf (stderr,