From adc67b6f75ec956a258962e24c2d64bc2601e5eb Mon Sep 17 00:00:00 2001 From: Xiretza Date: Thu, 3 Mar 2022 18:10:49 +0100 Subject: [PATCH 1/2] style.css: add fontawesome to beginning of font list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If there is some other font installed that 1) matches the four existing font families and 2) provides its own glyph in the private use area used by Awesome, then that font's glyph will be used instead of the intended icon. For example, the following character (U+F001, "music"):  ...looks like a pair of musical notes in fontawesome, but DejaVu Sans also provides a glyph, which looks like a couple of squares. DejaVu Sans matches first when "sans-serif" is requested, so its (unrelated) glyph is used. --- resources/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/style.css b/resources/style.css index 3bc7052..563ee0d 100644 --- a/resources/style.css +++ b/resources/style.css @@ -1,6 +1,6 @@ * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: Roboto, Helvetica, Arial, sans-serif; + font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; font-size: 13px; } From 54085dbde0689b1956ef38d6478c85d7bc888531 Mon Sep 17 00:00:00 2001 From: Andy Russell Date: Thu, 3 Mar 2022 19:40:43 -0500 Subject: [PATCH 2/2] avoid use-after-free in lambda --- src/bar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bar.cpp b/src/bar.cpp index 9685c7a..eb00dd1 100644 --- a/src/bar.cpp +++ b/src/bar.cpp @@ -750,7 +750,7 @@ void waybar::Bar::getModules(const Factory& factory, const std::string& pos, Gtk modules_right_.emplace_back(module_sp); } } - module->dp.connect([module, &name] { + module->dp.connect([module, name] { try { module->update(); } catch (const std::exception& e) {