Addendum to f0ddc00

Fixed a crash upon server exit if there was no CPerfStatManager created before stopping
multitheftauto · Aug 13, 2015 · f92f501 · f92f501
1 parent 4f44ffb
commit f92f501
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/MTA10_Server/mods/deathmatch/logic/CGame.cpp b/MTA10_Server/mods/deathmatch/logic/CGame.cpp
@@ -255,7 +255,8 @@ CGame::~CGame ( void )
     m_bBeingDeleted = true;
 
     // Stop the performance stats modules
-    CPerfStatManager::GetSingleton ()->Stop ();
+    if ( CPerfStatManager::GetSingleton () != nullptr )
+        CPerfStatManager::GetSingleton ()->Stop ();
 
     // Stop and flush sim packet handling
     CSimControl::EnableSimSystem ( false );

diff --git a/MTA10_Server/mods/deathmatch/logic/CPerfStatManager.cpp b/MTA10_Server/mods/deathmatch/logic/CPerfStatManager.cpp
@@ -53,6 +53,10 @@ static std::unique_ptr<CPerfStatManagerImpl> g_pPerfStatManagerImp;
 
 CPerfStatManager* CPerfStatManager::GetSingleton ( void )
 {
+    // If we're stopping the server, do not create a PerfStatManager just to destroy it
+    if ( g_pGame->IsBeingDeleted () )
+        return nullptr;
+
     if ( !g_pPerfStatManagerImp )
         g_pPerfStatManagerImp.reset(new CPerfStatManagerImpl ());
     return g_pPerfStatManagerImp.get();