Merge pull request #12967 from unknownbrackets/ui-lock

UI: Lock around removal from dispatch queue
This commit is contained in:
Unknown W. Brackets authored and GitHub committed 2020-05-24 14:47:04 -04:00
commit 8a9ea2aa86
1 file changed
+2
+2
View File
@@ -50,6 +50,7 @@ void DispatchEvents() {
}
void RemoveQueuedEventsByView(View *view) {
std::unique_lock<std::mutex> guard(eventMutex_);
for (auto it = g_dispatchQueue.begin(); it != g_dispatchQueue.end(); ) {
if (it->params.v == view) {
it = g_dispatchQueue.erase(it);
@@ -60,6 +61,7 @@ void RemoveQueuedEventsByView(View *view) {
}
void RemoveQueuedEventsByEvent(Event *event) {
std::unique_lock<std::mutex> guard(eventMutex_);
for (auto it = g_dispatchQueue.begin(); it != g_dispatchQueue.end(); ) {
if (it->e == event) {
it = g_dispatchQueue.erase(it);