doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed regression which was causing a deadlock when de-registering event handlers from an event handler

Browse Source
This commit is contained in:
Nav
2022-12-18 17:56:21 +00:00
parent 262c50ec3d
commit 0a6951865c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/EventManager/EventListener.cpp
View File

@@ -59,8 +59,12 @@ namespace Bloom
Logger::debug("Dispatching event " + event->getName() + " (" + std::to_string(event->id) + ")."); Logger::debug("Dispatching event " + event->getName() + " (" + std::to_string(event->id) + ").");
// Dispatch the event to all registered handlers // Dispatch the event to all registered handlers
const auto mappingLock = this->eventTypeToCallbacksMapping.acquireLock(); auto callbacks = std::vector<std::function<void(const Events::Event&)>>();
const auto& callbacks = this->eventTypeToCallbacksMapping.getValue().find(event->getType())->second;
{
const auto mappingLock = this->eventTypeToCallbacksMapping.acquireLock();
callbacks = this->eventTypeToCallbacksMapping.getValue().find(event->getType())->second;
}
for (auto& callback : callbacks) { for (auto& callback : callbacks) {
callback(*(event.get())); callback(*(event.get()));