diff --git a/.gitignore b/.gitignore index 0dc74984c..36f7d8f5a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ src/Makefile src/task stamp-h1 Makefile +configure config.log diff --git a/src/color.cpp b/src/color.cpp index 968da11c9..9de9b7942 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -242,8 +242,9 @@ std::string decode (color c) //////////////////////////////////////////////////////////////////////////////// std::string colorize (color fg, color bg, const std::string& input) { - if (fg != nocolor || bg != nocolor) - return decode (fg) + decode (bg) + input + decode (off); + if (input.length ()) + if (fg != nocolor || bg != nocolor) + return decode (fg) + decode (bg) + input + decode (off); return input; } diff --git a/src/task.cpp b/src/task.cpp index cb9092d67..a7541541b 100644 --- a/src/task.cpp +++ b/src/task.cpp @@ -1876,20 +1876,32 @@ void handleReportGHistory (const TDB& tdb, T& task, Config& conf) if (conf.get ("color", true)) { char number[24]; - sprintf (number, "%d", addedGroup[i->first]); - std::string aBar = number; - while (aBar.length () < addedBar) - aBar = " " + aBar; + std::string aBar = ""; + if (addedGroup[i->first]) + { + sprintf (number, "%d", addedGroup[i->first]); + aBar = number; + while (aBar.length () < addedBar) + aBar = " " + aBar; + } - sprintf (number, "%d", completedGroup[i->first]); - std::string cBar = number; - while (cBar.length () < completedBar) - cBar = " " + cBar; + std::string cBar = ""; + if (completedGroup[i->first]) + { + sprintf (number, "%d", completedGroup[i->first]); + cBar = number; + while (cBar.length () < completedBar) + cBar = " " + cBar; + } - sprintf (number, "%d", deletedGroup[i->first]); - std::string dBar = number; - while (dBar.length () < deletedBar) - dBar = " " + dBar; + std::string dBar = ""; + if (deletedGroup[i->first]) + { + sprintf (number, "%d", deletedGroup[i->first]); + dBar = number; + while (dBar.length () < deletedBar) + dBar = " " + dBar; + } bar = Text::colorize (Text::black, Text::on_green, aBar); bar += Text::colorize (Text::black, Text::on_yellow, cBar);