From 219a922c9ecc80c5ef47bca43bd5caac84bd854f Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Mon, 29 Oct 2007 11:57:17 +0000
Subject: [PATCH] Fixed crash in the server which was caused by not waiting
 long enough for the termination of threads.

---
 src/net/senderthread.h      | 2 +-
 src/net/servergamethread.h  | 2 +-
 src/net/serverlobbythread.h | 2 +-
 src/session.cpp             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/net/senderthread.h b/src/net/senderthread.h
index f14c6e38..34868e44 100644
--- a/src/net/senderthread.h
+++ b/src/net/senderthread.h
@@ -30,7 +30,7 @@
 #include <deque>
 #include <boost/shared_ptr.hpp>
 
-#define SENDER_THREAD_TERMINATE_TIMEOUT		200
+#define SENDER_THREAD_TERMINATE_TIMEOUT		2000
 #define SEND_TIMEOUT_MSEC					10
 #define SEND_QUEUE_SIZE						1000
 #define SEND_LOW_PRIO_QUEUE_SIZE			50000
diff --git a/src/net/servergamethread.h b/src/net/servergamethread.h
index 323ba3bd..9a39bc03 100644
--- a/src/net/servergamethread.h
+++ b/src/net/servergamethread.h
@@ -27,7 +27,7 @@
 
 #include <deque>
 
-#define GAME_THREAD_TERMINATE_TIMEOUT	200
+#define GAME_THREAD_TERMINATE_TIMEOUT	4000
 
 
 class SenderThread;
diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h
index a8ee04a8..6d683ab6 100644
--- a/src/net/serverlobbythread.h
+++ b/src/net/serverlobbythread.h
@@ -31,7 +31,7 @@
 #include <list>
 #include <core/boost/timers.hpp>
 
-#define LOBBY_THREAD_TERMINATE_TIMEOUT	200
+#define LOBBY_THREAD_TERMINATE_TIMEOUT	20000
 
 
 class SenderThread;
diff --git a/src/session.cpp b/src/session.cpp
index dd8f54c5..bd2cbc4d 100755
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -31,7 +31,7 @@
 #include <sstream>
 
 #define NET_CLIENT_TERMINATE_TIMEOUT_MSEC	1000
-#define NET_SERVER_TERMINATE_TIMEOUT_MSEC	2000
+#define NET_SERVER_TERMINATE_TIMEOUT_MSEC	10000
 #define NET_IRC_TERMINATE_TIMEOUT_MSEC		2000
 
 #define NET_DEFAULT_GAME					"default"