Merge branch 'obsd-master'

1 files changed, 3 insertions, 0 deletions

diff --git a/server.c b/server.c
index d6727450..f2799c1e 100644
--- a/server.c
+++ b/server.c
@@ -254,6 +254,9 @@ server_loop(void)
 
 	server_client_loop();
 
+	if (!options_get_number(global_options, "exit-empty") && !server_exit)
+		return (0);
+
 	if (!options_get_number(global_options, "exit-unattached")) {
 		if (!RB_EMPTY(&sessions))
 			return (0);