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 1/1] 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 deletions(-)

Index: ncmpcpp-0.5.10/src/ncmpcpp.cpp
===================================================================
--- ncmpcpp-0.5.10.orig/src/ncmpcpp.cpp	2012-04-01 09:49:09.000000000 -0700
+++ ncmpcpp-0.5.10/src/ncmpcpp.cpp	2012-10-22 11:50:44.836885069 -0700
@@ -249,6 +249,8 @@
 	Config.Read();
 	Key.Read();
 	
+	Config.GenerateColumns();
+	
 	if (getenv("MPD_HOST"))
 		Mpd.SetHostname(getenv("MPD_HOST"));
 	if (getenv("MPD_PORT"))
Index: ncmpcpp-0.5.10/src/settings.cpp
===================================================================
--- ncmpcpp-0.5.10.orig/src/settings.cpp	2012-04-01 09:49:09.000000000 -0700
+++ ncmpcpp-0.5.10/src/settings.cpp	2012-10-22 11:50:44.846885787 -0700
@@ -1330,7 +1330,11 @@
 		}
 	}
 	f.close();
-	
+}
+
+void NcmpcppConfig::GenerateColumns()
+{
+	columns.clear();
 	std::string width;
 	while (!(width = GetLineValue(song_list_columns_format, '(', ')', 1)).empty())
 	{
Index: ncmpcpp-0.5.10/src/settings.h
===================================================================
--- ncmpcpp-0.5.10.orig/src/settings.h	2012-04-01 09:49:09.000000000 -0700
+++ ncmpcpp-0.5.10/src/settings.h	2012-10-22 11:50:44.846885787 -0700
@@ -149,6 +149,7 @@
 	
 	void SetDefaults();
 	void Read();
+	void GenerateColumns();
 	
 	std::string ncmpcpp_directory;
 	std::string lyrics_directory;