Merge branch '0.6.x'

2015-05-02 21:31:26 +02:00
parent 3bd9c88f05 a40508179a
commit 405480e158
9 changed files with 39 additions and 22 deletions
--- a/src/settings.h
+++ b/src/settings.h
@@ -53,7 +53,7 @@ struct Configuration
 	: playlist_disable_highlight_delay(0), visualizer_sync_interval(0)
 	{ }

-	bool read(const std::vector<std::string> &config_paths);
+	bool read(const std::vector<std::string> &config_paths, bool ignore_errors);

 	std::string ncmpcpp_directory;
 	std::string lyrics_directory;