Merge branch 'main' into Fix-Typo

This commit is contained in:
Jakob P. Liljenberg 2024-04-30 17:02:16 +02:00 committed by GitHub
commit f8cfa70dda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -723,7 +723,7 @@ namespace Cpu {
old_watts = watts;
old_seconds = seconds;
old_status = status;
const string str_time = (seconds > 0 ? sec_to_dhms(seconds, true, true) : "");
const string str_time = (seconds > 0 ? sec_to_dhms(seconds, false, true) : "");
const string str_percent = to_string(percent) + '%';
const string str_watts = (watts != -1 and Config::getB("show_battery_watts") ? fmt::format("{:.2f}", watts) + 'W' : "");
const auto& bat_symbol = bat_symbols.at((bat_symbols.contains(status) ? status : "unknown"));