mraber/xmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

free stuff earlier, when they're no longer used

Browse Source
This commit is contained in:
phillbush 2020-09-16 21:04:43 -03:00
parent 59a8a95056
commit d3c2131250
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xmenu.c
View File

@ -1015,16 +1015,21 @@ drawitems(struct Menu *menu)
Convex, CoordModeOrigin); Convex, CoordModeOrigin);
} }
/* draw icon */ /* try to load icon */
if (item->file && !iflag) if (item->file && !iflag) {
item->icon = loadicon(item->file); item->icon = loadicon(item->file);
free(item->file);
}
/* draw icon if properly loaded */
if (item->icon) { if (item->icon) {
imlib_context_set_image(item->icon); imlib_context_set_image(item->icon);
imlib_context_set_drawable(item->sel); imlib_context_set_drawable(item->sel);
imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
imlib_context_set_drawable(item->unsel); imlib_context_set_drawable(item->unsel);
imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); 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) if (tmp->label != tmp->output)
free(tmp->label); free(tmp->label);
free(tmp->output); 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; item = item->next;
free(tmp); free(tmp);
} }