Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-01-17 11:26:10 +00:00
10 changed files with 203 additions and 203 deletions

2
cfg.c
View File

@ -286,8 +286,6 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int quiet)
}
free(buf);
if (cmdlist == NULL)
continue;
new_item = cmdq_get_command(cmdlist, NULL, NULL, 0);
if (item != NULL)
cmdq_insert_after(item, new_item);