games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

fix infinite recursion when using SDL_mixer v2.6

Browse Source 
Mix_HaltChannel -> soundFinishedCallback -> Mix_FreeChunk -> soundFinishedCallback -> ...
This commit is contained in:
Andrey Filipenkov
2022-07-20 16:48:32 +03:00
committed by Andrii Danylchenko
parent 0429ff61b0
commit f2187f6767
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/CMusicHandler.cpp
View File

@@ -257,13 +257,14 @@ void CSoundHandler::soundFinishedCallback(int channel)
{ {
std::map<int, std::function<void()> >::iterator iter; std::map<int, std::function<void()> >::iterator iter;
iter = callbacks.find(channel); iter = callbacks.find(channel);
if (iter == callbacks.end())
return;
assert(iter != callbacks.end()); auto callback = std::move(iter->second);
if (iter->second)
iter->second();
callbacks.erase(iter); callbacks.erase(iter);
if (callback)
callback();
} }
int CSoundHandler::ambientGetRange() const int CSoundHandler::ambientGetRange() const