Stop sound when patching sound bnp

merge/2021-11-19
kaetemi 3 years ago
parent 6a7bcf771d
commit a81fcd105a
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -1457,6 +1457,15 @@ void prelogInit()
} }
} }
void stopSoundMngr()
{
if (SoundMngr)
{
delete SoundMngr;
SoundMngr = NULL;
}
}
// *************************************************************************** // ***************************************************************************
void initBotObjectSelection() void initBotObjectSelection()

@ -57,7 +57,6 @@
#include "game_share/bg_downloader_msg.h" #include "game_share/bg_downloader_msg.h"
#include "global.h"
#include "login_patch.h" #include "login_patch.h"
#include "login.h" #include "login.h"
#include "user_agent.h" #include "user_agent.h"
@ -2593,7 +2592,7 @@ public:
} }
}; };
void stopSoundMngr();
// **************************************************************************** // ****************************************************************************
void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP) void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
@ -2606,11 +2605,10 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
// Destination File Name (in writable directory) // Destination File Name (in writable directory)
string DestinationName; string DestinationName;
if (NLMISC::startsWith(rFTP.FileName, "sound") && SoundMngr) if (NLMISC::startsWith(rFTP.FileName, "sound"))
{ {
// Stop sound playback // Stop sound playback
delete SoundMngr; stopSoundMngr();
SoundMngr = NULL;
} }
if (rFTP.ExtractPath.empty()) if (rFTP.ExtractPath.empty())

@ -37,6 +37,10 @@ void quitCrashReport()
{ {
} }
void stopSoundMngr()
{
}
/// domain server version for patch /// domain server version for patch
string R2ServerVersion; string R2ServerVersion;
/// name of the version (used to alias many version under the same name), /// name of the version (used to alias many version under the same name),

Loading…
Cancel
Save