Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a mutex to lock Win32 message handling #5304

Merged
merged 2 commits into from
Jan 17, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cpp/iedriver/IECommandExecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <algorithm>
#include <ctime>
#include <vector>
#include <mutex>

#include "command_types.h"
#include "errorcodes.h"
Expand Down Expand Up @@ -438,6 +439,10 @@ unsigned int WINAPI IECommandExecutor::ThreadProc(LPVOID lpParameter) {
LOG(DEBUG) << "Returned from DestroyWindow()";
break;
} else {
// We need to lock this mutex here to make sure only one thread is processing
// win32 messages at a time.
static std::mutex messageLock;
std::lock_guard<std::mutex> lock(messageLock);
::TranslateMessage(&msg);
::DispatchMessage(&msg);
}
Expand Down