Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-14 19:39:47 +00:00
Code Issues Releases Activity

Fix wrong output when nesting $combine-s

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-22 19:27:05 +01:00
parent 44a9e75290
commit ad1b72ed94
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/combine.cc
View File

@ -124,7 +124,8 @@ void print_combine(struct text_object *obj, char *p, int p_max_size)
generate_text_internal(&(buf[i][0]), max_user_text, *objsub); generate_text_internal(&(buf[i][0]), max_user_text, *objsub);
for(j=0; buf[i][j] != 0; j++) { for(j=0; buf[i][j] != 0; j++) {
if(buf[i][j] == '\t') buf[i][j] = ' '; if(buf[i][j] == '\t') buf[i][j] = ' ';
if(buf[i][j] == '\n' || buf[i][j] == 2) { //Some vars like $head use \002 instead of \n to separate lines if(buf[i][j] == '\n') buf[i][j] = 0; //the vars inside combine may not have a \n at the end
if(buf[i][j] == 2) { // \002 is used instead of \n to separate lines inside a var
buf[i][j] = 0; buf[i][j] = 0;
current[i]->row = strdup(&(buf[i][0])+nextstart); current[i]->row = strdup(&(buf[i][0])+nextstart);
if(i==0 && (long)strlen(current[i]->row) > longest) longest = (long)strlen(current[i]->row); if(i==0 && (long)strlen(current[i]->row) > longest) longest = (long)strlen(current[i]->row);