Fixed server shutdown crash.

Tweaked status messages from ASE master servers.

Author: ccw808

MTA10_Server/mods/deathmatch/logic/CGame.cpp

@@ -255,6 +255,10 @@ CGame::~CGame ( void )
 {
     m_bBeingDeleted = true;
 
+    // Stop the web server first to avoid threading issues
+    if ( m_pHTTPD )
+        m_pHTTPD->StopHTTPD ();
+
     // Stop the performance stats modules
     if ( CPerfStatManager::GetSingleton () != NULL )
         CPerfStatManager::GetSingleton ()->Stop ();
@@ -270,10 +274,6 @@ CGame::~CGame ( void )
     // Stop networking
     Stop ();
 
-    // Stop the web server
-    if ( m_pHTTPD )
-        m_pHTTPD->StopHTTPD ();
-
      // Destroy our stuff
     SAFE_DELETE( m_pResourceManager );
 

MTA10_Server/mods/deathmatch/utils/CHqComms.h

@@ -45,7 +45,7 @@ class CHqComms : public CRefCountable
             m_Stage = HQCOMMS_STAGE_QUERY;
 
             CBitStream bitStream;
-            bitStream->Write( (char)2 );    // Data version
+            bitStream->Write( (char)3 );    // Data version
             bitStream->WriteStr( g_pGame->GetConfig()->GetServerIP() );
             bitStream->Write( g_pGame->GetConfig()->GetServerPort() );
             bitStream->WriteStr( CStaticFunctionDefinitions::GetVersionSortable() );
@@ -211,17 +211,18 @@ class CHqComms : public CRefCountable
         bitStream->Read( uiNumServers );
         for( uint i = 0 ; i < uiNumServers ; i++ )
         {
-            char bAcceptsPush, bDoReminders, bHideProblems;
+            char bAcceptsPush, bDoReminders, bHideProblems, bHideSuccess;
             uint uiReminderIntervalMins;
             SString strDesc, strUrl;
             bitStream->Read( bAcceptsPush );
             bitStream->Read( bDoReminders );
             bitStream->Read( bHideProblems );
+            bitStream->Read( bHideSuccess );
             bitStream->Read( uiReminderIntervalMins );
             bitStream->ReadStr( strDesc );
             if ( !bitStream->ReadStr( strUrl ) )
                 break;
-            g_pGame->GetMasterServerAnnouncer()->AddServer( bAcceptsPush != 0, bDoReminders != 0, bHideProblems != 0, Max( 5U, uiReminderIntervalMins ), strDesc, strUrl );
+            g_pGame->GetMasterServerAnnouncer()->AddServer( bAcceptsPush != 0, bDoReminders != 0, bHideProblems != 0, bHideSuccess != 0, Max( 5U, uiReminderIntervalMins ), strDesc, strUrl );
         }
     }
 

MTA10_Server/mods/deathmatch/utils/CMasterServerAnnouncer.h

@@ -13,6 +13,7 @@ struct SMasterServerDefinition
     bool bAcceptsPush;
     bool bDoReminders;
     bool bHideProblems;
+    bool bHideSuccess;
     uint uiReminderIntervalMins;
     SString strDesc;
     SString strURL;
@@ -125,7 +126,7 @@ class CMasterServer : public CRefCountable
             if ( m_Stage < ANNOUNCE_STAGE_REMINDER )
             {
                 m_Stage = ANNOUNCE_STAGE_REMINDER;
-                if ( !m_Definition.bHideProblems || iError == 200 )
+                if ( !m_Definition.bHideSuccess )
                 {
                     CArgMap argMap;
                     argMap.SetFromString( data );
@@ -223,10 +224,10 @@ class CMasterServerAnnouncer
     void InitServerList( void )
     {
         assert( m_MasterServerList.empty() );
-        AddServer( true, true, false, 60 * 24, "Querying MTA master server...", QUERY_URL_MTA_MASTER_SERVER );
+        AddServer( true, true, false, false, 60 * 24, "Querying MTA master server...", QUERY_URL_MTA_MASTER_SERVER );
     }
 
-    void AddServer( bool bAcceptsPush, bool bDoReminders, bool bHideProblems, uint uiReminderIntervalMins, const SString& strDesc, const SString& strInUrl )
+    void AddServer( bool bAcceptsPush, bool bDoReminders, bool bHideProblems, bool bHideSuccess, uint uiReminderIntervalMins, const SString& strDesc, const SString& strInUrl )
     {
         // Check if server is already present
         for( auto pMasterServer : m_MasterServerList )
@@ -255,7 +256,7 @@ class CMasterServerAnnouncer
         strUrl = strUrl.Replace( "%EXTRA%", strExtra );
         strUrl = strUrl.Replace( "%IP%", strServerIP );
 
-        SMasterServerDefinition masterServerDefinition = { bAcceptsPush, bDoReminders, bHideProblems, uiReminderIntervalMins, strDesc, strUrl };
+        SMasterServerDefinition masterServerDefinition = { bAcceptsPush, bDoReminders, bHideProblems, bHideSuccess, uiReminderIntervalMins, strDesc, strUrl };
         m_MasterServerList.push_back( new CMasterServer( masterServerDefinition ) );
     }