Fix launch w/o configuration

This commit is contained in:
Přemysl Eric Janouch 2016-11-20 23:14:47 +01:00
parent b9a27cf187
commit 1fa2ddbdfd
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 4 additions and 1 deletions

View File

@ -695,7 +695,7 @@ static struct config_schema g_config_settings[] =
{ .name = "address", { .name = "address",
.comment = "Address to connect to the MPD server", .comment = "Address to connect to the MPD server",
.type = CONFIG_ITEM_STRING, .type = CONFIG_ITEM_STRING,
.default_ = "localhost" }, .default_ = "\"localhost\"" },
{ .name = "password", { .name = "password",
.comment = "Password to use for MPD authentication", .comment = "Password to use for MPD authentication",
.type = CONFIG_ITEM_STRING }, .type = CONFIG_ITEM_STRING },
@ -832,6 +832,9 @@ app_load_configuration (void)
config_register_module (config, "colors", load_config_colors, NULL); config_register_module (config, "colors", load_config_colors, NULL);
config_register_module (config, "streams", load_config_streams, NULL); config_register_module (config, "streams", load_config_streams, NULL);
// Bootstrap configuration, so that we can access schema items at all
config_load (config, config_item_object ());
char *filename = resolve_filename char *filename = resolve_filename
(PROGRAM_NAME ".conf", resolve_relative_config_filename); (PROGRAM_NAME ".conf", resolve_relative_config_filename);
if (!filename) if (!filename)