fix: 'ethernet' network state should have precedence over 'disabled'
This commit is contained in:
@ -272,11 +272,9 @@ void waybar::modules::Network::worker() {
|
|||||||
|
|
||||||
const std::string waybar::modules::Network::getNetworkState() const {
|
const std::string waybar::modules::Network::getNetworkState() const {
|
||||||
#ifdef WANT_RFKILL
|
#ifdef WANT_RFKILL
|
||||||
if (rfkill_.getState()) return "disabled";
|
if (rfkill_.getState() && ifid_ == -1) return "disabled";
|
||||||
#endif
|
#endif
|
||||||
if (ifid_ == -1) {
|
if (ifid_ == -1) return "disconnected";
|
||||||
return "disconnected";
|
|
||||||
}
|
|
||||||
if (!carrier_) return "disconnected";
|
if (!carrier_) return "disconnected";
|
||||||
if (ipaddr_.empty() && ipaddr6_.empty()) return "linked";
|
if (ipaddr_.empty() && ipaddr6_.empty()) return "linked";
|
||||||
if (essid_.empty()) return "ethernet";
|
if (essid_.empty()) return "ethernet";
|
||||||
|
Reference in New Issue
Block a user