Fix deadlock on workspace scrolling

Make the mutex guard lifecycle finish before the send ipc command
by adding scope around the code.

Fixes #395 .
This commit is contained in:
sheenobu 2019-07-05 20:19:50 -07:00
parent 67ad0e69ce
commit a6c0bc5a52
1 changed files with 18 additions and 16 deletions

View File

@ -218,6 +218,8 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
if (dir == SCROLL_DIR::NONE) {
return true;
}
std::string name;
{
std::lock_guard<std::mutex> lock(mutex_);
auto it = std::find_if(workspaces_.begin(), workspaces_.end(), [](const auto &workspace) {
return workspace["focused"].asBool();
@ -225,7 +227,6 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
if (it == workspaces_.end()) {
return true;
}
std::string name;
if (dir == SCROLL_DIR::DOWN || dir == SCROLL_DIR::RIGHT) {
name = getCycleWorkspace(it, false);
} else if (dir == SCROLL_DIR::UP || dir == SCROLL_DIR::LEFT) {
@ -236,6 +237,7 @@ bool Workspaces::handleScroll(GdkEventScroll *e) {
if (name == (*it)["name"].asString()) {
return true;
}
}
try {
ipc_.sendCmd(IPC_COMMAND, fmt::format("workspace \"{}\"", name));
} catch (const std::exception &e) {