fixed bug with graphs resetting colour. sf.net bug 1420473

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@564 7f574dfc-610e-0410-a909-a81674777703

diff --git a/ChangeLog b/ChangeLog
index a47037c..e66cb5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
 # $Id$
 
+2006-03-07
+       * Fixed issue where some WM's don't control conky own_window windows.
+       * Added newly-updated vim file detection and syntax hilighting files to svn.
+       * Fixed issue with graphs resetting colours (sf.net bug #1420473)
+
 2006-03-06
        * Fixed battery problems when charged
        * MPD code handles broken pipe now, instead of just killing conky
        * Switch from CVS to SVN.  Thanks SourceForge.
-       * Fixed issue where some WM's don't control conky own_window windows.
-       * Added newly-updated vim file detection and syntax hilighting files to svn.
 
 2006-03-05
        * Added patch to make $cpu stuff work on alpha (thanks Thomas Cort)

diff --git a/src/conky.c b/src/conky.c
index a670344..2936944 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -4090,6 +4090,7 @@ static void draw_line(char *s)
                                        int h =
                                            specials[special_index].height;
                                        int by;
+                                       unsigned long last_colour = current_color;
 #ifdef XFT
                                        if (use_xft) {
                                             by = cur_y - (font_ascent() + h) / 2 - 1;
@@ -4148,15 +4149,16 @@ static void draw_line(char *s)
                                                    specials
                                                    [special_index].height;
                                        }
-                               }
-                               if (draw_mode == BG) {
+/*                             if (draw_mode == BG) {
                                        set_foreground_color(default_bg_color);
                                }
                                else if (draw_mode == OUTLINE) {
                                        set_foreground_color(default_out_color);
                                } else {
                                        set_foreground_color(default_fg_color);
-                               }
+                               }*/
+                               set_foreground_color(last_colour);
+                       }
                                break;
                        
                                case FONT: