From d3c213125090d49408c78d2c4a9200ec1575c187 Mon Sep 17 00:00:00 2001 From: phillbush Date: Wed, 16 Sep 2020 21:04:43 -0300 Subject: [PATCH] free stuff earlier, when they're no longer used --- xmenu.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/xmenu.c b/xmenu.c index 931d3fe..d557f6d 100644 --- a/xmenu.c +++ b/xmenu.c @@ -1015,16 +1015,21 @@ drawitems(struct Menu *menu) Convex, CoordModeOrigin); } - /* draw icon */ - if (item->file && !iflag) + /* try to load icon */ + if (item->file && !iflag) { item->icon = loadicon(item->file); + free(item->file); + } + /* draw icon if properly loaded */ if (item->icon) { imlib_context_set_image(item->icon); imlib_context_set_drawable(item->sel); imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); imlib_context_set_drawable(item->unsel); imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); + imlib_context_set_image(item->icon); + imlib_free_image(); } } } @@ -1316,13 +1321,6 @@ cleanmenu(struct Menu *menu) if (tmp->label != tmp->output) free(tmp->label); free(tmp->output); - if (tmp->file != NULL) { - free(tmp->file); - if (tmp->icon != NULL) { - imlib_context_set_image(tmp->icon); - imlib_free_image(); - } - } item = item->next; free(tmp); } -- 2.20.1