summaryrefslogtreecommitdiffstats
path: root/hacks/metaballs.c
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:58 +0100
committerSimon Rettberg2019-02-18 11:55:58 +0100
commitaa7530630e595b80d5db54655fd827b61edc0fd7 (patch)
tree048cb74072450c7592f254c3537ac8f252d09d73 /hacks/metaballs.c
parentForgot one DPMS killing instance (diff)
parentUpdate to 5.42 (diff)
downloadxscreensaver-23.tar.gz
xscreensaver-23.tar.xz
xscreensaver-23.zip
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/metaballs.c')
-rw-r--r--hacks/metaballs.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/hacks/metaballs.c b/hacks/metaballs.c
index 3a2ae73..f387785 100644
--- a/hacks/metaballs.c
+++ b/hacks/metaballs.c
@@ -386,19 +386,20 @@ metaballs_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
metaballs_free (Display *dpy, Window window, void *closure)
{
-#if 0
struct state *st = (struct state *) closure;
- free( st->pImage->data );
- XDestroyImage( st->pImage );
- free( st->aiColorVals );
- free( st->blobs );
- for (i = 0; i < st->iWinHeight; ++i)
- free( st->blub[i] );
- free( st->blub );
- for (i = 0; i < st->dradius; ++i)
- free( st->blob[i] );
- free( st->blob );
-#endif
+ int i;
+ if (st->pImage) XDestroyImage (st->pImage);
+ free (st->aiColorVals);
+ free (st->blobs);
+ for (i = 0; i < st->iWinHeight; ++i)
+ free (st->blub[i]);
+ free (st->blub);
+ for (i = 0; i < st->dradius; ++i)
+ free (st->blob[i]);
+ if (st->sColor) free (st->sColor);
+ free (st->blob);
+ XFreeGC (dpy, st->gc);
+ free (st);
}