Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-14 22:01:11 +01:00
3 changed files with 17 additions and 6 deletions

5
cfg.c
View File

@ -128,7 +128,10 @@ load_cfg(const char *path, struct cmd_q *cmdq, int quiet)
static void
cfg_default_done(__unused struct cmd_q *cmdq)
{
if (--cfg_references != 0)
log_debug("%s: %u references%s", __func__, cfg_references,
cfg_finished ? " (finished)" : "");
if (cfg_finished || --cfg_references != 0)
return;
cfg_finished = 1;