Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

fix manual merge

Browse Source
This commit is contained in:
Nikolas Garofil 2010-11-20 17:25:06 +01:00
parent fcf318c6dd
commit c63f42a693
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.cc
View File

@ -460,7 +460,7 @@ void print_loadavg(struct text_object *obj, char *p, int p_max_size)
void scan_no_update(struct text_object *obj, const char *arg)
{
obj->data.s = (char*) malloc(text_buffer_size);
obj->data.s = (char*) malloc(text_buffer_size.get(*state));
evaluate(arg, obj->data.s, text_buffer_size.get(*state));
obj->data.s = (char*) realloc(obj->data.s, strlen(obj->data.s) + 1);
}