Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.6.x'

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-05-02 21:31:26 +02:00
parent 3bd9c88f05 a40508179a
commit 405480e158
9 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings.cpp
View File

@@ -190,7 +190,7 @@ option_parser::worker border(NC::Border &arg, NC::Border value)
}
bool Configuration::read(const std::vector<std::string> &config_paths)
bool Configuration::read(const std::vector<std::string> &config_paths, bool ignore_errors)
{
std::string mpd_host;
unsigned mpd_port;
@@ -678,13 +678,13 @@ bool Configuration::read(const std::vector<std::string> &config_paths)
return std::all_of(
config_paths.begin(),
config_paths.end(),
[&p](const std::string &config_path) {
[&](const std::string &config_path) {
std::ifstream f(config_path);
if (f.is_open())
std::clog << "Reading configuration from " << config_path << "...\n";
return p.run(f);
return p.run(f, ignore_errors);
}
) && p.initialize_undefined();
) && p.initialize_undefined(ignore_errors);
}
/* vim: set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab : */