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

configuration: make ignore-config-errors take no arguments

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-09-12 21:06:01 +02:00
parent 71fa345280
commit a94e620f29
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/configuration.cpp
View File

@@ -78,7 +78,7 @@ bool configure(int argc, char **argv)
("host,h", po::value<std::string>()->default_value("localhost"), "connect to server at host") ("host,h", po::value<std::string>()->default_value("localhost"), "connect to server at host")
("port,p", po::value<int>()->default_value(6600), "connect to server at port") ("port,p", po::value<int>()->default_value(6600), "connect to server at port")
("config,c", po::value<std::vector<std::string>>(&config_paths)->default_value(default_config_paths, join<std::string>(default_config_paths, " AND ")), "specify configuration file(s)") ("config,c", po::value<std::vector<std::string>>(&config_paths)->default_value(default_config_paths, join<std::string>(default_config_paths, " AND ")), "specify configuration file(s)")
("ignore-config-errors", po::value<bool>()->default_value(false), "ignore unknown and invalid options in configuration files") ("ignore-config-errors", "ignore unknown and invalid options in configuration files")
("bindings,b", po::value<std::string>(&bindings_path)->default_value("~/.ncmpcpp/bindings"), "specify bindings file") ("bindings,b", po::value<std::string>(&bindings_path)->default_value("~/.ncmpcpp/bindings"), "specify bindings file")
("screen,s", po::value<std::string>(), "specify initial screen") ("screen,s", po::value<std::string>(), "specify initial screen")
("slave-screen,S", po::value<std::string>(), "specify initial slave screen") ("slave-screen,S", po::value<std::string>(), "specify initial slave screen")
@@ -151,7 +151,7 @@ bool configure(int argc, char **argv)
// read configuration // read configuration
std::for_each(config_paths.begin(), config_paths.end(), expand_home); std::for_each(config_paths.begin(), config_paths.end(), expand_home);
if (Config.read(config_paths, vm["ignore-config-errors"].as<bool>()) == false) if (Config.read(config_paths, vm.count("ignore-config-errors")) == false)
exit(1); exit(1);
// if bindings file was not specified, use the one from main directory. // if bindings file was not specified, use the one from main directory.