Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Change conflicting variable

This commit is contained in:
Jonas Kvinge 2019-09-23 00:34:29 +02:00
parent 3d3d641e1c
commit 34f071ed1d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/utilities.cpp
View File

@ -820,19 +820,19 @@ QString MacAddress() {
QString ret;
for (QNetworkInterface &interface : QNetworkInterface::allInterfaces()) {
for (QNetworkInterface &netif : QNetworkInterface::allInterfaces()) {
if (
(interface.hardwareAddress() == "00:00:00:00:00:00") ||
(interface.flags() & QNetworkInterface::IsLoopBack) ||
!(interface.flags() & QNetworkInterface::IsUp) ||
!(interface.flags() & QNetworkInterface::IsRunning)
(netif.hardwareAddress() == "00:00:00:00:00:00") ||
(netif.flags() & QNetworkInterface::IsLoopBack) ||
!(netif.flags() & QNetworkInterface::IsUp) ||
!(netif.flags() & QNetworkInterface::IsRunning)
) { continue; }
if (ret.isEmpty()
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
|| interface.type() == QNetworkInterface::Ethernet || interface.type() == QNetworkInterface::Wifi
|| netif.type() == QNetworkInterface::Ethernet || netif.type() == QNetworkInterface::Wifi
#endif
) {
ret = interface.hardwareAddress();
ret = netif.hardwareAddress();
}
}