projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glslideshow.c
diff --git
a/hacks/glx/glslideshow.c
b/hacks/glx/glslideshow.c
index 3e3548d8e08f6df20ded6b18d5c73c3b81fd11ab..64b1494cbfd15532d542e79f54b6c42671f319f2 100644
(file)
--- a/
hacks/glx/glslideshow.c
+++ b/
hacks/glx/glslideshow.c
@@
-78,7
+78,7
@@
"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
-# define
refresh
_slideshow 0
+# define
free
_slideshow 0
# define release_slideshow 0
# include "xlockmore.h"
# define release_slideshow 0
# include "xlockmore.h"
@@
-1079,11
+1079,7
@@
init_slideshow (ModeInfo *mi)
slideshow_state *ss;
int wire = MI_IS_WIREFRAME(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) {
ss = &sss[screen];
if ((ss->glx_context = init_GL(mi)) != NULL) {