diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp index a90f9af76..458e78be2 100644 --- a/ryzom/client/src/init.cpp +++ b/ryzom/client/src/init.cpp @@ -1457,6 +1457,15 @@ void prelogInit() } } +void stopSoundMngr() +{ + if (SoundMngr) + { + delete SoundMngr; + SoundMngr = NULL; + } +} + // *************************************************************************** void initBotObjectSelection() diff --git a/ryzom/client/src/login_patch.cpp b/ryzom/client/src/login_patch.cpp index 4e09559a0..1ecb8bffd 100644 --- a/ryzom/client/src/login_patch.cpp +++ b/ryzom/client/src/login_patch.cpp @@ -57,7 +57,6 @@ #include "game_share/bg_downloader_msg.h" -#include "global.h" #include "login_patch.h" #include "login.h" #include "user_agent.h" @@ -2593,7 +2592,7 @@ public: } }; - +void stopSoundMngr(); // **************************************************************************** void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP) @@ -2606,11 +2605,10 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP) // Destination File Name (in writable directory) string DestinationName; - if (NLMISC::startsWith(rFTP.FileName, "sound") && SoundMngr) + if (NLMISC::startsWith(rFTP.FileName, "sound")) { // Stop sound playback - delete SoundMngr; - SoundMngr = NULL; + stopSoundMngr(); } if (rFTP.ExtractPath.empty()) diff --git a/ryzom/tools/client/client_patcher/main.cpp b/ryzom/tools/client/client_patcher/main.cpp index 9855a6b65..ce6375318 100644 --- a/ryzom/tools/client/client_patcher/main.cpp +++ b/ryzom/tools/client/client_patcher/main.cpp @@ -37,6 +37,10 @@ void quitCrashReport() { } +void stopSoundMngr() +{ +} + /// domain server version for patch string R2ServerVersion; /// name of the version (used to alias many version under the same name),