29 lines
881 B
Diff
29 lines
881 B
Diff
commit 7a4aa146187cc60d2df66333b3e7dd5a5176f793
|
|
Author: Nicholas Marriott <nicholas.marriott@gmail.com>
|
|
Date: Wed Oct 28 10:09:10 2020 +0000
|
|
|
|
Do not require that there be no other clients before loading the config,
|
|
being the first client is enough. GitHub issue 2438.
|
|
|
|
--- a/server-client.c
|
|
+++ b/server-client.c
|
|
@@ -1975,13 +1975,13 @@
|
|
}
|
|
|
|
/*
|
|
- * If this is the first client that has finished identifying, load
|
|
- * configuration files.
|
|
+ * If this is the first client, load configuration files. Any later
|
|
+ * clients are allowed to continue with their command even if the
|
|
+ * config has not been loaded - they might have been run from inside it
|
|
*/
|
|
if ((~c->flags & CLIENT_EXIT) &&
|
|
- !cfg_finished &&
|
|
- c == TAILQ_FIRST(&clients) &&
|
|
- TAILQ_NEXT(c, entry) == NULL)
|
|
+ !cfg_finished &&
|
|
+ c == TAILQ_FIRST(&clients))
|
|
start_cfg();
|
|
}
|
|
|