Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(network): display as disabled if rfkill and no carrier

Browse Source 
We want the "disabled" state even when an interface is selected
explicitly.
This commit is contained in:
peelz
2025-07-01 23:40:42 -04:00
parent cae5f9a56f
commit 46a152abc8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/network.cpp
View File

@ -271,11 +271,12 @@ void waybar::modules::Network::worker() {
} }
const std::string waybar::modules::Network::getNetworkState() const { const std::string waybar::modules::Network::getNetworkState() const {
if (ifid_ == -1 || !carrier_) {
#ifdef WANT_RFKILL #ifdef WANT_RFKILL
if (rfkill_.getState() && ifid_ == -1) return "disabled"; if (rfkill_.getState()) return "disabled";
#endif #endif
if (ifid_ == -1) return "disconnected"; 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";
return "wifi"; return "wifi";