mirror of
https://github.com/Llewellynvdm/conky.git
synced 2025-01-28 01:28:30 +00:00
Bugfix: make sure $else works correct and without memleaks
This commit is contained in:
parent
5eebf1c516
commit
f3e250df55
@ -1167,7 +1167,7 @@ void generate_text_internal(char *p, int p_max_size,
|
|||||||
* Do Ninja jump here: without leaving traces.
|
* Do Ninja jump here: without leaving traces.
|
||||||
* This is to prevent us from stale jumped flags.
|
* This is to prevent us from stale jumped flags.
|
||||||
*/
|
*/
|
||||||
obj = obj->sub;
|
obj = obj->special_data;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
OBJ(endif) {
|
OBJ(endif) {
|
||||||
|
@ -1781,7 +1781,7 @@ void free_text_objects(struct text_object *root, int internal)
|
|||||||
#ifdef XMMS2
|
#ifdef XMMS2
|
||||||
if(obj->type == OBJ_if_xmms2_connected) type_is_if = 1;
|
if(obj->type == OBJ_if_xmms2_connected) type_is_if = 1;
|
||||||
#endif
|
#endif
|
||||||
if(obj->special_data && type_is_if == 0) free(obj->special_data);
|
if(obj->special_data && obj->type != OBJ_else && type_is_if == 0) free(obj->special_data);
|
||||||
free(obj);
|
free(obj);
|
||||||
}
|
}
|
||||||
#undef data
|
#undef data
|
||||||
|
Loading…
x
Reference in New Issue
Block a user