Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not crash when a monitor is removed

Browse Source
This commit is contained in:
Jef Steelant
2022-11-09 09:34:19 +01:00
parent 8be5bab8ad
commit 8f4f67f69f
6 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/hyprland/window.cpp
View File

@ -25,7 +25,13 @@ Window::Window(const std::string& id, const Bar& bar, const Json::Value& config)
ALabel::update();
// register for hyprland ipc
gIPC->registerForIPC("activewindow", [&](const std::string& ev) { this->onEvent(ev); });
gIPC->registerForIPC("activewindow", this);
}
Window::~Window() {
gIPC->unregisterForIPC(this);
// wait for possible event handler to finish
std::lock_guard<std::mutex> lg(mutex_);
}
auto Window::update() -> void {
@ -50,7 +56,9 @@ uint Window::getActiveWorkspaceID(std::string monitorName) {
assert(json.isArray());
auto monitor = std::find_if(json.begin(), json.end(),
[&](Json::Value monitor) { return monitor["name"] == monitorName; });
assert(monitor != std::end(json));
if(monitor == std::end(json)) {
return 0;
}
return (*monitor)["activeWorkspace"]["id"].as<uint>();
}
@ -89,4 +97,4 @@ void Window::onEvent(const std::string& ev) {
dp.emit();
}
} // namespace waybar::modules::hyprland
} // namespace waybar::modules::hyprland