From bb102091248de0180b4a60cd984b366b04bd39d4 Mon Sep 17 00:00:00 2001
From: unknown <unknown@localhost.(none)>
Date: Fri, 15 Aug 2008 21:52:19 +0200
Subject: [PATCH] workaround for counting item length, will fix it later

---
 examples/ncmpcpprc | 2 +-
 src/menu.cpp       | 5 ++---
 src/settings.cpp   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/ncmpcpprc b/examples/ncmpcpprc
index 164b996d..92d16136 100644
--- a/examples/ncmpcpprc
+++ b/examples/ncmpcpprc
@@ -57,7 +57,7 @@
 ## - white
 ##
 #
-#song_list_format = "[green](%l)[/green] {%a - }{%t}|{[white]%f[/white]}"
+#song_list_format = "[green](%l)[/green] {%a - }{%t}|{[white]%f}"
 #
 #song_status_format = "(%l) {%a - }{%t}|{%f}"
 #
diff --git a/src/menu.cpp b/src/menu.cpp
index b4892ca4..dc1fe6a3 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -368,12 +368,11 @@ void Menu::Refresh(bool redraw_whole_window)
 		line++;
 		
 		if (*it == itsHighlight && itsHighlightEnabled)
-		{
 			Reverse(0);
-			SetColor(itsBaseColor);
-		}
 		if (itsOptions[*it]->is_bold)
 			Bold(0);
+		
+		SetColor(itsBaseColor);
 	}
 	NeedsRedraw.clear();
 	wrefresh(itsWindow);
diff --git a/src/settings.cpp b/src/settings.cpp
index b688250f..524b4654 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -27,7 +27,7 @@ using std::ifstream;
 void DefaultConfiguration(ncmpcpp_config &conf)
 {
 	conf.mpd_music_dir = "/var/lib/mpd/music";
-	conf.song_list_format = "[green](%l)[/green] {%a - }{%t}|{[white]%f[/white]}";
+	conf.song_list_format = "[green](%l)[/green] {%a - }{%t}|{[white]%f}";
 	conf.song_status_format = "(%l) {%a - }{%t}|{%f}";
 	conf.song_window_title_format = "{%a - }{%t}|{%f}";
 	conf.song_library_format = "{%n - }{%t}|{%f}";