diff -r 329d3308e2e3 -r ca72264f921a netserver/hedgewars-server.hs
--- a/netserver/hedgewars-server.hs	Mon Oct 20 18:35:36 2008 +0000
+++ b/netserver/hedgewars-server.hs	Mon Oct 20 18:51:43 2008 +0000
@@ -77,7 +77,9 @@
 
 			clientsIn <- sendAnswers answers mclient mclients mrooms
 			
-			when ((isDedicated globalOptions) || (not $ null clientsIn)) $ mainLoop servSock acceptChan clientsIn mrooms
+			let hadRooms = (not $ null rooms) && (null mrooms)
+				in unless ((not $ isDedicated globalOptions) && ((null clientsIn) || hadRooms)) $
+					mainLoop servSock acceptChan clientsIn mrooms
 
 
 startServer serverSocket = do