1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-14 19:39:47 +00:00

Fix alignment ($align[rc]) issue for exec & lua objects.

This commit is contained in:
Brenden Matthews 2010-06-18 11:15:01 -07:00
parent 6c26b12a39
commit 77aa301d51

View File

@ -2380,9 +2380,10 @@ void generate_text_internal(char *p, int p_max_size,
#ifdef HAVE_ICONV #ifdef HAVE_ICONV
iconv_convert(&a, buff_in, p, p_max_size); iconv_convert(&a, buff_in, p, p_max_size);
#endif /* HAVE_ICONV */ #endif /* HAVE_ICONV */
if (obj->type != OBJ_text && obj->type != OBJ_execp && obj->type != OBJ_execpi if (obj->type == OBJ_execp || obj->type == OBJ_execpi || obj->type
== OBJ_exec
#ifdef HAVE_LUA #ifdef HAVE_LUA
&& obj->type != OBJ_lua && obj->type != OBJ_lua_parse || obj->type == OBJ_lua || obj->type == OBJ_lua_parse
#endif /* HAVE_LUA */ #endif /* HAVE_LUA */
) { ) {
substitute_newlines(p, a - 2); substitute_newlines(p, a - 2);