diff --git a/ReactCommon/fabric/events/EventEmitter.cpp b/ReactCommon/fabric/events/EventEmitter.cpp index 337baf8320b..e5a8eeecba4 100644 --- a/ReactCommon/fabric/events/EventEmitter.cpp +++ b/ReactCommon/fabric/events/EventEmitter.cpp @@ -31,8 +31,8 @@ static std::string normalizeEventType(const std::string &type) { return prefixedType; } -std::recursive_mutex &EventEmitter::DispatchMutex() { - static std::recursive_mutex mutex; +std::mutex &EventEmitter::DispatchMutex() { + static std::mutex mutex; return mutex; } diff --git a/ReactCommon/fabric/events/EventEmitter.h b/ReactCommon/fabric/events/EventEmitter.h index a8e591fa52f..8e3045170a5 100644 --- a/ReactCommon/fabric/events/EventEmitter.h +++ b/ReactCommon/fabric/events/EventEmitter.h @@ -34,7 +34,7 @@ class EventEmitter { using Tag = int32_t; public: - static std::recursive_mutex &DispatchMutex(); + static std::mutex &DispatchMutex(); static ValueFactory defaultPayloadFactory(); diff --git a/ReactCommon/fabric/events/EventQueue.cpp b/ReactCommon/fabric/events/EventQueue.cpp index a3878a6967a..f9f970b0c7a 100644 --- a/ReactCommon/fabric/events/EventQueue.cpp +++ b/ReactCommon/fabric/events/EventQueue.cpp @@ -40,7 +40,7 @@ void EventQueue::onBeat(jsi::Runtime &runtime) const { } { - std::lock_guard lock(EventEmitter::DispatchMutex()); + std::lock_guard lock(EventEmitter::DispatchMutex()); for (const auto &event : queue) { if (event.eventTarget) { diff --git a/ReactCommon/fabric/uimanager/ShadowTree.cpp b/ReactCommon/fabric/uimanager/ShadowTree.cpp index f39c45e76d5..08fd34dfe24 100644 --- a/ReactCommon/fabric/uimanager/ShadowTree.cpp +++ b/ReactCommon/fabric/uimanager/ShadowTree.cpp @@ -155,7 +155,7 @@ void ShadowTree::emitLayoutEvents( void ShadowTree::toggleEventEmitters( const ShadowViewMutationList &mutations) const { - std::lock_guard lock(EventEmitter::DispatchMutex()); + std::lock_guard lock(EventEmitter::DispatchMutex()); for (const auto &mutation : mutations) { if (mutation.type == ShadowViewMutation::Create) {