tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: cancel thread and fix window close

Browse Source
This commit is contained in:
Alex
2020-05-27 09:10:38 +02:00
parent 3b16946c25
commit 6e7f22ac3a
11 changed files with 47 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/AModule.cpp
View File

@ -6,7 +6,7 @@ namespace waybar {
AModule::AModule(const Json::Value& config, const std::string& name, const std::string& id,
bool enable_click, bool enable_scroll)
: config_(std::move(config)) {
: name_(std::move(name)), config_(std::move(config)) {
// configure events' user commands
if (config_["on-click"].isString() || config_["on-click-middle"].isString() ||
config_["on-click-backward"].isString() || config_["on-click-forward"].isString() ||
@ -23,11 +23,12 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
AModule::~AModule() {
for (const auto& pid : pid_) {
if (pid != -1) {
kill(-pid, 9);
killpg(pid, SIGTERM);
}
}
}
auto AModule::update() -> void {
// Run user-provided update handler if configured
if (config_["on-update"].isString()) {