Merge pull request #2853 from dpayne/fix_use_after_free_on_task_close

2024-01-22 09:01:48 +01:00 · 2024-01-22 09:01:48 +01:00 · 27fec51439
parent 6e12f81223 53233e47a3
commit 27fec51439
1 changed files with 1 additions and 1 deletions
--- a/src/modules/wlr/taskbar.cpp
+++ b/src/modules/wlr/taskbar.cpp
@ -527,11 +527,11 @@ void Task::handle_closed() {
  spdlog::debug("{} closed", repr());
  zwlr_foreign_toplevel_handle_v1_destroy(handle_);
  handle_ = nullptr;
-  tbar_->remove_task(id_);
  if (button_visible_) {
    tbar_->remove_button(button);
    button_visible_ = false;
  }
+  tbar_->remove_task(id_);
 }

 bool Task::handle_clicked(GdkEventButton *bt) {