From c0a39f34cd8ebce08ce8db72174d49a158608922 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 25 May 2019 18:02:36 +0200 Subject: [PATCH] refactor(network): don't clear ipaddr --- src/modules/network.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/network.cpp b/src/modules/network.cpp index 99fc780a..d2541012 100644 --- a/src/modules/network.cpp +++ b/src/modules/network.cpp @@ -448,15 +448,13 @@ out: void waybar::modules::Network::getInterfaceAddress() { unsigned int cidrRaw; struct ifaddrs *ifaddr, *ifa; - ipaddr_.clear(); - netmask_.clear(); cidr_ = 0; int success = getifaddrs(&ifaddr); if (success != 0) { return; } ifa = ifaddr; - while (ifa != nullptr && ipaddr_.empty() && netmask_.empty()) { + while (ifa != nullptr) { if (ifa->ifa_addr != nullptr && ifa->ifa_addr->sa_family == family_ && ifa->ifa_name == ifname_) { char ipaddr[INET6_ADDRSTRLEN]; @@ -475,6 +473,7 @@ void waybar::modules::Network::getInterfaceAddress() { cidrRaw >>= 1; } cidr_ = cidr; + break; } ifa = ifa->ifa_next; }