Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-05-03 23:02:28 +01:00
11 changed files with 146 additions and 35 deletions

5
cfg.c
View File

@ -301,9 +301,10 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int quiet)
free(buf);
new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
if (item != NULL)
if (item != NULL) {
cmdq_insert_after(item, new_item);
else
item = new_item;
} else
cmdq_append(c, new_item);
cmd_list_free(cmdlist);