From 52626dd655d930c32fdbe7f4f75eb5e5bb9fea77 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Thu, 10 Jan 2008 01:17:09 +0000
Subject: [PATCH] Fixed that CNetLogManager::Shutdown wasn't called. Fixed that
 CNetLogger::m_Level was used uninitialised.

This was SVN commit r5542.
---
 source/network/NetLog.cpp         | 1 +
 source/ps/GameSetup/GameSetup.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/network/NetLog.cpp b/source/network/NetLog.cpp
index 0e91ab1621..d35f54f756 100644
--- a/source/network/NetLog.cpp
+++ b/source/network/NetLog.cpp
@@ -461,6 +461,7 @@ void CNetLogConsoleSink::Write( char c )
 CNetLogger::CNetLogger( const CStr& name )
 {
 	m_Name = name;
+	m_Level = LOG_LEVEL_ALL;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index 5582b9f413..10f249dbf3 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -78,9 +78,10 @@
 #include "sound/CMusicPlayer.h"
 #include "sound/JSI_Sound.h"
 
-#include "network/SessionManager.h"
-#include "network/Server.h"
 #include "network/Client.h"
+#include "network/NetLog.h"
+#include "network/Server.h"
+#include "network/SessionManager.h"
 
 #include "ps/GameSetup/Atlas.h"
 #include "ps/GameSetup/GameSetup.h"
@@ -835,6 +836,10 @@ void Shutdown(uint flags)
 	CSocketBase::Shutdown();
 	TIMER_END("shutdown CSocketBase");
 
+	TIMER_BEGIN("shutdown CNetLogManager");
+	CNetLogManager::Shutdown();
+	TIMER_END("shutdown CNetLogManager");
+
 	// Really shut down the i18n system. Any future calls
 	// to translate() will crash.
 	TIMER_BEGIN("shutdown I18N");