Fix window width calculation when $lua returns newlines
authorPavel Labath <pavelo@centrum.sk>
Wed, 9 Sep 2009 19:15:18 +0000 (21:15 +0200)
committerPavel Labath <pavelo@centrum.sk>
Wed, 9 Sep 2009 19:15:18 +0000 (21:15 +0200)
I just hope it doesn't break anything.

src/conky.c

index 6b9feaf..9a20e61 100644 (file)
@@ -3236,7 +3236,8 @@ static void generate_text_internal(char *p, int p_max_size,
 #ifdef HAVE_ICONV
                        iconv_convert(a, buff_in, p, p_max_size);
 #endif /* HAVE_ICONV */
-                       if (obj->type != OBJ_text && obj->type != OBJ_execp && obj->type != OBJ_execpi) {
+                       if (obj->type != OBJ_text && obj->type != OBJ_execp && obj->type != OBJ_execpi
+                                       && obj->type != OBJ_lua && obj->type != OBJ_lua_parse) {
                                substitute_newlines(p, a - 2);
                        }
                        p += a;