1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00

Bugfix: Lines printed to STDOUT with out_to_console were printed twice

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1127 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Nikolas Garofil 2008-06-04 22:35:02 +00:00
parent a9624c80cc
commit 3969388b4a

View File

@ -6547,7 +6547,10 @@ static void update_text_area(void)
/* drawing stuff */ /* drawing stuff */
static int cur_x, cur_y; /* current x and y for drawing */ static int cur_x, cur_y; /* current x and y for drawing */
#endif
//draw_mode also without X11 because we only need to print to stdout with FG
static int draw_mode; /* FG, BG or OUTLINE */ static int draw_mode; /* FG, BG or OUTLINE */
#ifdef X11
static long current_color; static long current_color;
#ifdef X11 #ifdef X11
@ -6632,7 +6635,7 @@ static void draw_string(const char *s)
} }
width_of_s = get_string_width(s); width_of_s = get_string_width(s);
if (out_to_console) { if (out_to_console && draw_mode == FG) {
printf("%s\n", s); printf("%s\n", s);
fflush(stdout); /* output immediately, don't buffer */ fflush(stdout); /* output immediately, don't buffer */
} }
@ -7206,8 +7209,8 @@ static void draw_stuff(void)
} }
set_foreground_color(default_fg_color); set_foreground_color(default_fg_color);
draw_mode = FG;
#endif /* X11 */ #endif /* X11 */
draw_mode = FG;
draw_text(); draw_text();
#ifdef X11 #ifdef X11
#ifdef HAVE_XDBE #ifdef HAVE_XDBE