From 6126def6c5b339c7f43d99c47501dde21d4943b3 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Mon, 16 Jul 2012 00:20:25 +0200
Subject: [PATCH] settings: fix columns generation without configuration file
 (ticket #3490)

---
 src/ncmpcpp.cpp  | 2 ++
 src/settings.cpp | 6 +++++-
 src/settings.h   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 4341a45b..8fd4aa36 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -249,6 +249,8 @@ int main(int argc, char **argv)
 	Config.Read();
 	Key.Read();
 	
+	Config.GenerateColumns();
+	
 	if (getenv("MPD_HOST"))
 		Mpd.SetHostname(getenv("MPD_HOST"));
 	if (getenv("MPD_PORT"))
diff --git a/src/settings.cpp b/src/settings.cpp
index f82973fe..e4f80669 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1365,7 +1365,11 @@ void NcmpcppConfig::Read()
 		}
 	}
 	f.close();
-	
+}
+
+void NcmpcppConfig::GenerateColumns()
+{
+	columns.clear();
 	std::string width;
 	while (!(width = GetLineValue(song_list_columns_format, '(', ')', 1)).empty())
 	{
diff --git a/src/settings.h b/src/settings.h
index 07114de0..406c941e 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -152,6 +152,7 @@ struct NcmpcppConfig
 	
 	void SetDefaults();
 	void Read();
+	void GenerateColumns();
 	
 	std::string ncmpcpp_directory;
 	std::string lyrics_directory;