X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglslideshow.c;h=64b1494cbfd15532d542e79f54b6c42671f319f2;hb=39809ded547bdbb08207d3e514950425215b4410;hp=3e3548d8e08f6df20ded6b18d5c73c3b81fd11ab;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver diff --git a/hacks/glx/glslideshow.c b/hacks/glx/glslideshow.c index 3e3548d8..64b1494c 100644 --- a/hacks/glx/glslideshow.c +++ b/hacks/glx/glslideshow.c @@ -78,7 +78,7 @@ "*grabDesktopImages: False \n" \ "*chooseRandomImages: True \n" -# define refresh_slideshow 0 +# define free_slideshow 0 # define release_slideshow 0 # include "xlockmore.h" @@ -1079,11 +1079,7 @@ init_slideshow (ModeInfo *mi) slideshow_state *ss; int wire = MI_IS_WIREFRAME(mi); - if (sss == NULL) { - if ((sss = (slideshow_state *) - calloc (MI_NUM_SCREENS(mi), sizeof(slideshow_state))) == NULL) - return; - } + MI_INIT (mi, sss); ss = &sss[screen]; if ((ss->glx_context = init_GL(mi)) != NULL) {