mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-23 22:37:55 +02:00
Fix possible crashes on audio shutdown
This commit is contained in:
@@ -37,7 +37,8 @@ CAudioBase::~CAudioBase()
|
||||
--initializationCounter;
|
||||
|
||||
if(initializationCounter == 0 && initializeSuccess)
|
||||
{
|
||||
Mix_CloseAudio();
|
||||
|
||||
initializeSuccess = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -232,8 +232,7 @@ MusicEntry::~MusicEntry()
|
||||
|
||||
if(loop == 0 && Mix_FadingMusic() != MIX_NO_FADING)
|
||||
{
|
||||
assert(0);
|
||||
logGlobal->error("Attempt to delete music while fading out!");
|
||||
logGlobal->trace("Halting playback of music file %s", currentName.getOriginalName());
|
||||
Mix_HaltMusic();
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +56,7 @@ CSoundHandler::~CSoundHandler()
|
||||
{
|
||||
if(isInitialized())
|
||||
{
|
||||
Mix_ChannelFinished(nullptr);
|
||||
Mix_HaltChannel(-1);
|
||||
|
||||
for(auto & chunk : soundChunks)
|
||||
|
||||
Reference in New Issue
Block a user