From ae030a366922280468f671efba382a4f507511d8 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Tue, 23 Oct 2007 20:01:56 +0000
Subject: [PATCH] Fixed Lobby Thread termination issue if an exception is
 thrown.

---
 src/net/common/serveracceptthread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net/common/serveracceptthread.cpp b/src/net/common/serveracceptthread.cpp
index bfe69244..ebd31bf0 100644
--- a/src/net/common/serveracceptthread.cpp
+++ b/src/net/common/serveracceptthread.cpp
@@ -79,7 +79,7 @@ ServerAcceptThread::Main()
 		Listen();
 		GetLobbyThread().Run();
 
-		while (!ShouldTerminate())
+		while (!ShouldTerminate() && !GetLobbyThread().Join(0))
 		{
 			// The main server thread is simple. It only accepts connections.
 			AcceptLoop();