diff options
author | nicm <nicm> | 2017-04-21 14:04:54 +0000 |
---|---|---|
committer | nicm <nicm> | 2017-04-21 14:04:54 +0000 |
commit | 428be9803cab5121bc8ccad5ecbcce509c57b3a1 (patch) | |
tree | 6eb647c91cf8d1163d2b548181d0d8cb1f3c3584 | |
parent | bba588752f8085da13edcacd71101055bd617303 (diff) | |
download | rtmux-428be9803cab5121bc8ccad5ecbcce509c57b3a1.tar.gz rtmux-428be9803cab5121bc8ccad5ecbcce509c57b3a1.tar.bz2 rtmux-428be9803cab5121bc8ccad5ecbcce509c57b3a1.zip |
History needs to be loaded after config parsing is done - now that
commands are queued, that's in cfg_done not after start_cfg finishes.
-rw-r--r-- | cfg.c | 2 | ||||
-rw-r--r-- | server.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -43,6 +43,8 @@ cfg_done(__unused struct cmdq_item *item, __unused void *data) if (!RB_EMPTY(&sessions)) cfg_show_causes(RB_MIN(sessions, &sessions)); + status_prompt_load_history(); + return (CMD_RETURN_NORMAL); } @@ -176,8 +176,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile) start_cfg(); - status_prompt_load_history(); - server_add_accept(0); proc_loop(server_proc, server_loop); |