From fd478bf2ab3d00be7889054b4c517463e48df7ca Mon Sep 17 00:00:00 2001
From: yangyingchao <yang.yingchao@qq.com>
Date: Mon, 19 Aug 2024 12:35:52 +0800
Subject: [PATCH 1/2] fix crash caused by use bar instance after it is freed
 (use-after-free)

---
 include/bar.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/bar.hpp b/include/bar.hpp
index 43756bfd..936bc749 100644
--- a/include/bar.hpp
+++ b/include/bar.hpp
@@ -54,7 +54,7 @@ class BarIpcClient;
 }
 #endif  // HAVE_SWAY
 
-class Bar {
+class Bar : public sigc::trackable {
  public:
   using bar_mode_map = std::map<std::string, struct bar_mode>;
   static const bar_mode_map PRESET_MODES;

From 0fb1957daedee6316932be438fbbcf6140003849 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <andrea@scarpino.dev>
Date: Tue, 20 Aug 2024 13:57:29 +0200
Subject: [PATCH 2/2] fix: check format-source before use

---
 src/modules/pulseaudio.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/pulseaudio.cpp b/src/modules/pulseaudio.cpp
index 3efd9d23..255ca571 100644
--- a/src/modules/pulseaudio.cpp
+++ b/src/modules/pulseaudio.cpp
@@ -106,7 +106,7 @@ auto waybar::modules::Pulseaudio::update() -> void {
     }
   } else {
     label_.get_style_context()->remove_class("source-muted");
-    if (config_["format-source-muted"].isString()) {
+    if (config_["format-source"].isString()) {
       format_source = config_["format-source"].asString();
     }
   }