Merge remote-tracking branch 'upstream/master' into keyboard_state_errors

This commit is contained in:
Grant Moyer 2022-03-04 12:14:23 -05:00
commit 18717d4b12
2 changed files with 2 additions and 2 deletions

View File

@ -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;
}

View File

@ -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) {