blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix deadlock on workspace scrolling (#403) 

Fix deadlock on workspace scrolling
This commit is contained in:
Alex 2019-07-06 10:30:57 +02:00 committed by GitHub
parent 67ad0e69ce a6c0bc5a52
commit d607a4e33f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/modules/sway/workspaces.cpp
View File

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