From 8005cc82c6698cc4164aa2d25ada80e6cdd31430 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Thu, 4 Jun 2009 20:37:18 +0000
Subject: [PATCH] Fixed server termination crash. However, network games are
 still not properly terminated.

---
 src/net/common/serverlobbythread.cpp | 4 ----
 src/net/common/sessionmanager.cpp    | 1 -
 src/net/serverlobbythread.h          | 9 +++++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index 4a892f1f..6bb8eb1e 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -518,10 +518,6 @@ ServerLobbyThread::Main()
 		GetCallback().SignalNetServerError(e.GetErrorId(), e.GetOsErrorCode());
 		LOG_ERROR(e.what());
 	}
-
-	// Remove all sessions.
-	m_gameSessionManager.Clear();
-	m_sessionManager.Clear();
 }
 
 void
diff --git a/src/net/common/sessionmanager.cpp b/src/net/common/sessionmanager.cpp
index 5d1cb3fe..afbc25b9 100644
--- a/src/net/common/sessionmanager.cpp
+++ b/src/net/common/sessionmanager.cpp
@@ -31,7 +31,6 @@ SessionManager::SessionManager()
 
 SessionManager::~SessionManager()
 {
-	Clear();
 }
 
 bool
diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h
index 656d1b5c..b8ac9d44 100644
--- a/src/net/serverlobbythread.h
+++ b/src/net/serverlobbythread.h
@@ -173,10 +173,14 @@ private:
 
 	boost::shared_ptr<boost::asio::io_service> m_ioService;
 	boost::shared_ptr<boost::asio::io_service::work> m_work;
-	TimerManager m_timerManager;
+
+	boost::shared_ptr<ServerSenderCallback> m_senderCallback;
+	boost::shared_ptr<SenderInterface> m_sender;
+	boost::shared_ptr<ReceiverHelper> m_receiver;
 
 	SessionManager m_sessionManager;
 	SessionManager m_gameSessionManager;
+	TimerManager m_timerManager;
 
 	TimerClientAddressMap m_timerAvatarClientAddressMap;
 	mutable boost::mutex m_timerAvatarClientAddressMapMutex;
@@ -197,9 +201,6 @@ private:
 
 	GameMap m_gameMap;
 
-	boost::shared_ptr<SenderInterface> m_sender;
-	boost::shared_ptr<ReceiverHelper> m_receiver;
-	boost::shared_ptr<ServerSenderCallback> m_senderCallback;
 	GuiInterface &m_gui;
 	AvatarManager &m_avatarManager;