From http://www.jwz.org/xscreensaver/xscreensaver-5.15.tar.gz

[xscreensaver] / hacks / glx / glslideshow.c

diff --git a/hacks/glx/glslideshow.c b/hacks/glx/glslideshow.c
index be77dc1fef0a66e6af3960e2ff55beadeb1d9adf..d939c97e305347de1777262b3413869d04ec415f 100644 (file)
--- a/hacks/glx/glslideshow.c
+++ b/hacks/glx/glslideshow.c
@@ -358,17 +358,17 @@ image_loaded_cb (const char *filename, XRectangle *geom,
       img->geom.height *= scale;
     }
 
-# if 0 /* xscreensaver-getimage returns paths relative to the image directory
-          now, so leave the sub-directory part in.
-        */
-  if (img->title)  /* strip filename to part between last "/" and last ".". */
+  /* xscreensaver-getimage returns paths relative to the image directory
+     now, so leave the sub-directory part in.  Unless it's an absolute path.
+  */
+  if (img->title && img->title[0] == '/')
     {
+      /* strip filename to part between last "/" and last ".". */
       char *s = strrchr (img->title, '/');
       if (s) strcpy (img->title, s+1);
       s = strrchr (img->title, '.');
       if (s) *s = 0;
     }
-# endif /* 0 */
 
   if (debug_p)
     fprintf (stderr, "%s: loaded   img %2d: \"%s\"\n",
@@ -1214,7 +1214,6 @@ draw_slideshow (ModeInfo *mi)
 
   draw_sprites (mi);
 
-  ss->fps = fps_compute (mi->fpst, 0);
   if (mi->fps_p) do_fps (mi);
 
   glFinish();