aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornicm <nicm>2017-04-21 14:04:54 +0000
committernicm <nicm>2017-04-21 14:04:54 +0000
commit428be9803cab5121bc8ccad5ecbcce509c57b3a1 (patch)
tree6eb647c91cf8d1163d2b548181d0d8cb1f3c3584
parentbba588752f8085da13edcacd71101055bd617303 (diff)
downloadrtmux-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.c2
-rw-r--r--server.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cfg.c b/cfg.c
index 93d0f8f6..f98d5f0b 100644
--- a/cfg.c
+++ b/cfg.c
@@ -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);
}
diff --git a/server.c b/server.c
index 70f1a76f..71c0e25a 100644
--- a/server.c
+++ b/server.c
@@ -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);