1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-04 04:58:32 +00:00

Merge branch 'master' of git.omp.am:/home/omp/git/conky

This commit is contained in:
Brenden Matthews 2009-05-13 12:29:09 -06:00
commit b4ca1d146f

View File

@ -3268,7 +3268,8 @@ static void generate_text_internal(char *p, int p_max_size,
#endif
p[0] = 0;
for (obj = root.next; obj && p_max_size > 0; obj = obj->next) {
obj = root.next;
while (obj && p_max_size > 0) {
needed = 0; // reset for top stuff
/* IFBLOCK jumping algorithm
@ -5273,6 +5274,7 @@ static void generate_text_internal(char *p, int p_max_size,
p += a;
p_max_size -= a;
}
obj = obj->next;
}
}