Merge branch 'obsd-master'

Conflicts:
	Makefile
	format.c

1 files changed, 2 insertions, 1 deletions

diff --git a/server.c b/server.c
index 62d05ebe..2a888f22 100644
--- a/server.c
+++ b/server.c
@@ -251,9 +251,10 @@ void
 server_loop(void)
 {
 	while (!server_should_shutdown()) {
+		log_debug("event dispatch enter");
 		event_loop(EVLOOP_ONCE);
+		log_debug("event dispatch exit");
 
-		server_window_loop();
 		server_client_loop();
 	}
 }