Merge pull request #4258 from notpeelz/fix-network-eth-rfkill-precedence

fix: 'ethernet' network state should have precedence over 'disabled'
This commit is contained in:
Alexis Rouillard 2025-07-01 16:31:54 +01:00 committed by GitHub
commit 88766de1ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions

View File

@ -272,11 +272,9 @@ void waybar::modules::Network::worker() {
const std::string waybar::modules::Network::getNetworkState() const {
#ifdef WANT_RFKILL
if (rfkill_.getState()) return "disabled";
if (rfkill_.getState() && ifid_ == -1) return "disabled";
#endif
if (ifid_ == -1) {
return "disconnected";
}
if (ifid_ == -1) return "disconnected";
if (!carrier_) return "disconnected";
if (ipaddr_.empty() && ipaddr6_.empty()) return "linked";
if (essid_.empty()) return "ethernet";