diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/fireworkx.c | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/fireworkx.c')
-rw-r--r-- | hacks/fireworkx.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/hacks/fireworkx.c b/hacks/fireworkx.c index faf3745..57ba128 100644 --- a/hacks/fireworkx.c +++ b/hacks/fireworkx.c @@ -571,11 +571,13 @@ static void resize(struct state *st) XSync(st->dpy, 0); if (st->xim) { - if (st->xim->data == (char *)st->palaka2) st->xim->data = NULL; + /* if (st->xim->data == (char *)st->palaka2) */ + st->xim->data = NULL; XDestroyImage(st->xim); XSync(st->dpy, 0); free(st->mem2); free(st->mem1); + st->xim = 0; } st->xim = XCreateImage(st->dpy, xwa.visual, xwa.depth, ZPixmap, 0, 0, st->width, st->height, 8, 0); @@ -841,6 +843,14 @@ fireworkx_free (Display *dpy, Window window, void *closure) free(st->mem1); free(st->fireshell_array->fpix); free(st->fireshell_array); + if (st->xim) { + st->xim->data = NULL; + XDestroyImage (st->xim); + } + if (st->light_map) free(st->light_map); + if (st->colors) free (st->colors); + XFreeGC (dpy, st->gc); + free(st); } static const char *fireworkx_defaults [] = |