Merge branch 'master' of github.com:Alexays/Waybar into add_css_reload

This commit is contained in:
dpayne 2024-01-22 12:40:02 -08:00
commit 970a7519d4
2 changed files with 2 additions and 2 deletions

View File

@ -66,7 +66,7 @@ class UPower : public AModule {
Devices devices; Devices devices;
std::mutex m_Mutex; std::mutex m_Mutex;
UpClient *client; UpClient *client;
UpDevice *displayDevice; UpDevice *displayDevice = nullptr;
guint login1_id; guint login1_id;
GDBusConnection *login1_connection; GDBusConnection *login1_connection;
std::unique_ptr<UPowerTooltip> upower_tooltip; std::unique_ptr<UPowerTooltip> upower_tooltip;

View File

@ -527,11 +527,11 @@ void Task::handle_closed() {
spdlog::debug("{} closed", repr()); spdlog::debug("{} closed", repr());
zwlr_foreign_toplevel_handle_v1_destroy(handle_); zwlr_foreign_toplevel_handle_v1_destroy(handle_);
handle_ = nullptr; handle_ = nullptr;
tbar_->remove_task(id_);
if (button_visible_) { if (button_visible_) {
tbar_->remove_button(button); tbar_->remove_button(button);
button_visible_ = false; button_visible_ = false;
} }
tbar_->remove_task(id_);
} }
bool Task::handle_clicked(GdkEventButton *bt) { bool Task::handle_clicked(GdkEventButton *bt) {