From 6f88f9aeb2287137ed36ea973a68164a4b59daf4 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Wed, 26 Aug 2009 17:00:46 +0200 Subject: [PATCH] rename empty_tag config option to empty_tag_marker it was conflicting with empty_tag_color. since empty_tag_color contains empty_tag, ncmpcpp was parsing wrong variable if the first variable was before the second one in configuration file. --- doc/config | 2 +- doc/ncmpcpp.1 | 2 +- src/settings.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/config b/doc/config index 6e553e90..7c75ae78 100644 --- a/doc/config +++ b/doc/config @@ -226,7 +226,7 @@ # #mouse_support = "yes" # -#empty_tag = "" +#empty_tag_marker = "" # #enable_window_title = "yes" # diff --git a/doc/ncmpcpp.1 b/doc/ncmpcpp.1 index 1eb13ef7..6894e222 100644 --- a/doc/ncmpcpp.1 +++ b/doc/ncmpcpp.1 @@ -238,7 +238,7 @@ Default user interface used by ncmpcpp at start. .B media_library_left_column = a/y/g/c/p Default tag type for left column in media library. Legend for possible letters is in SONG FORMAT section. .TP -.B empty_tag = TEXT +.B empty_tag_marker = TEXT Text that will be displayed, if requested tag is not set. .TP .B empty_tag_color = COLOR diff --git a/src/settings.cpp b/src/settings.cpp index e56b0149..7cceb144 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -817,7 +817,7 @@ void ReadConfiguration(ncmpcpp_config &conf) conf.song_window_title_format += '}'; } } - else if (cl.find("empty_tag") != std::string::npos) + else if (cl.find("empty_tag_marker") != std::string::npos) { conf.empty_tag = v; // is this case empty string is allowed }