blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ISSUE #878. Try catch Clock timezones

This commit is contained in:
Viktar Lukashonak 2023-03-02 10:07:10 +03:00
parent f29a400c97
commit 43862ceb34
No known key found for this signature in database
GPG Key ID: 08A413AA87200A6F
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/clock.cpp
View File

@ -22,14 +22,20 @@ waybar::modules::Clock::Clock(const std::string& id, const Json::Value& config)
is_timezoned_list_in_tooltip_(false) {
if (config_["timezones"].isArray() && !config_["timezones"].empty()) {
for (const auto& zone_name : config_["timezones"]) {
if (!zone_name.isString() || zone_name.asString().empty()) {
time_zones_.push_back(nullptr);
if (!zone_name.isString() || zone_name.asString().empty())
continue;
try {
time_zones_.push_back(date::locate_zone(zone_name.asString()));
} catch(const std::exception& e) {
spdlog::warn("Timezone: {0}. {1}", zone_name.asString(), e.what());
}
time_zones_.push_back(date::locate_zone(zone_name.asString()));
}
} else if (config_["timezone"].isString() && !config_["timezone"].asString().empty()) {
time_zones_.push_back(date::locate_zone(config_["timezone"].asString()));
try {
time_zones_.push_back(date::locate_zone(config_["timezone"].asString()));
} catch (const std::exception& e) {
spdlog::warn("Timezone: {0}. {1}", config_["timezone"].asString(), e.what());
}
}
// If all timezones are parsed and no one is good, add current time zone. nullptr in timezones