games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Fix possible crashes on audio shutdown

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-12 13:32:46 +00:00
parent 4684756c49
commit 6855b895a0
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/media/CAudioBase.cpp
View File

@@ -37,7 +37,8 @@ CAudioBase::~CAudioBase()
--initializationCounter; --initializationCounter;
if(initializationCounter == 0 && initializeSuccess) if(initializationCounter == 0 && initializeSuccess)
{
Mix_CloseAudio(); Mix_CloseAudio();
initializeSuccess = false;
initializeSuccess = false; }
} }

3
client/media/CMusicHandler.cpp
View File

@@ -232,8 +232,7 @@ MusicEntry::~MusicEntry()
if(loop == 0 && Mix_FadingMusic() != MIX_NO_FADING) if(loop == 0 && Mix_FadingMusic() != MIX_NO_FADING)
{ {
assert(0); logGlobal->trace("Halting playback of music file %s", currentName.getOriginalName());
logGlobal->error("Attempt to delete music while fading out!");
Mix_HaltMusic(); Mix_HaltMusic();
} }

1
client/media/CSoundHandler.cpp
View File

@@ -56,6 +56,7 @@ CSoundHandler::~CSoundHandler()
{ {
if(isInitialized()) if(isInitialized())
{ {
Mix_ChannelFinished(nullptr);
Mix_HaltChannel(-1); Mix_HaltChannel(-1);
for(auto & chunk : soundChunks) for(auto & chunk : soundChunks)