From c8ca8b37251cc7240b86e9144fbe1b37d36417cb Mon Sep 17 00:00:00 2001 From: Alexis Date: Sun, 26 Aug 2018 21:41:34 +0200 Subject: [PATCH] fix(Custom): hide label when exec-if failed --- src/modules/custom.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp index 181aaf2b..d05abc0c 100644 --- a/src/modules/custom.cpp +++ b/src/modules/custom.cpp @@ -7,6 +7,7 @@ waybar::modules::Custom::Custom(const std::string name, if (!config_["exec"]) { throw std::runtime_error(name_ + " has no exec path."); } + label_.set_name("custom-" + name_); worker(); } @@ -19,6 +20,7 @@ void waybar::modules::Custom::worker() auto res = waybar::util::command::exec(config_["exec-if"].asString()); if (res.exit_code != 0) { can_update = false; + label_.hide(); } } if (can_update) { @@ -35,9 +37,7 @@ auto waybar::modules::Custom::update() -> void // Hide label if output is empty if (res.out.empty() || res.exit_code != 0) { label_.hide(); - label_.set_name(""); } else { - label_.set_name("custom-" + name_); auto format = config_["format"] ? config_["format"].asString() : "{}"; auto str = fmt::format(format, res.out); label_.set_text(str);