Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-11 00:18:29 +00:00
Code Issues Releases Activity

Fix `using "draw_shades yes" lua script runs twice per update' (sf.net #3524540)

Browse Source 
bugreported by arclance
This commit is contained in:
Pavel Labath 2012-06-03 16:20:17 +02:00
parent ddef05d4eb
commit 11e32706d4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conky.cc
View File

@ -1864,7 +1864,6 @@ static void draw_text(void)
} }
#endif #endif
#ifdef BUILD_X11 #ifdef BUILD_X11
llua_draw_pre_hook();
if (out_to_x.get(*state)) { if (out_to_x.get(*state)) {
cur_y = text_start_y; cur_y = text_start_y;
int bw = border_width.get(*state); int bw = border_width.get(*state);
@ -1896,9 +1895,6 @@ static void draw_text(void)
attron(COLOR_PAIR(COLOR_WHITE)); attron(COLOR_PAIR(COLOR_WHITE));
#endif /* BUILD_NCURSES */ #endif /* BUILD_NCURSES */
for_each_line(text_buffer, draw_line); for_each_line(text_buffer, draw_line);
#ifdef BUILD_X11
llua_draw_post_hook();
#endif /* BUILD_X11 */
#ifdef BUILD_HTTP #ifdef BUILD_HTTP
if (out_to_http.get(*state)) { if (out_to_http.get(*state)) {
webpage.append(WEBPAGE_END); webpage.append(WEBPAGE_END);
@ -1921,6 +1917,7 @@ static void draw_stuff(void)
if(!append_fpointer) if(!append_fpointer)
NORM_ERR("Cannot append to '%s'", append_file.get(*state).c_str()); NORM_ERR("Cannot append to '%s'", append_file.get(*state).c_str());
} }
llua_draw_pre_hook();
#ifdef BUILD_X11 #ifdef BUILD_X11
if (out_to_x.get(*state)) { if (out_to_x.get(*state)) {
selected_font = 0; selected_font = 0;
@ -1959,6 +1956,7 @@ static void draw_stuff(void)
#endif /* BUILD_X11 */ #endif /* BUILD_X11 */
draw_mode = FG; draw_mode = FG;
draw_text(); draw_text();
llua_draw_post_hook();
#if defined(BUILD_X11) #if defined(BUILD_X11)
#if defined(BUILD_XDBE) #if defined(BUILD_XDBE)
if (out_to_x.get(*state)) { if (out_to_x.get(*state)) {