Merge pull request #1769 from ericliou/master

This commit is contained in:
Alex 2022-11-04 22:01:36 +01:00 committed by GitHub
commit bd567800c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -470,7 +470,9 @@ const std::tuple<uint8_t, float, std::string, float> waybar::modules::Battery::g
}
}
if (!adapter_.empty() && status == "Discharging") {
// Give `Plugged` higher priority over `Not charging`.
// So in a setting where TLP is used, `Plugged` is shown when the threshold is reached
if (!adapter_.empty() && (status == "Discharging" || status == "Not charging")) {
bool online;
std::string current_status;
std::ifstream(adapter_ / "online") >> online;