diff options
| -rw-r--r-- | xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 | ||||
| -rw-r--r-- | xbmc/network/linux/NetworkLinux.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp index 6c940d7d12..21902bdbcd 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -481,7 +481,7 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg) Configure(); if (!m_extError) { - m_state = AE_TOP_CONFIGURED_IDLE; + m_state = AE_TOP_CONFIGURED_PLAY; m_extTimeout = 0; } else diff --git a/xbmc/network/linux/NetworkLinux.cpp b/xbmc/network/linux/NetworkLinux.cpp index d85b0cd288..9771763818 100644 --- a/xbmc/network/linux/NetworkLinux.cpp +++ b/xbmc/network/linux/NetworkLinux.cpp @@ -421,8 +421,11 @@ void CNetworkLinux::queryInterfaceList() continue; GetMacAddress(cur->ifa_name, macAddrRaw); - // Add the interface. - m_interfaces.push_back(new CNetworkInterfaceLinux(this, cur->ifa_name, macAddrRaw)); + + // only add interfaces with non-zero mac addresses + if (macAddrRaw[0] || macAddrRaw[1] || macAddrRaw[2] || macAddrRaw[3] || macAddrRaw[4] || macAddrRaw[5]) + // Add the interface. + m_interfaces.push_back(new CNetworkInterfaceLinux(this, cur->ifa_name, macAddrRaw)); } freeifaddrs(list); @@ -458,7 +461,10 @@ void CNetworkLinux::queryInterfaceList() // save the result std::string interfaceName = p; GetMacAddress(interfaceName, macAddrRaw); - m_interfaces.push_back(new CNetworkInterfaceLinux(this, interfaceName, macAddrRaw)); + + // only add interfaces with non-zero mac addresses + if (macAddrRaw[0] || macAddrRaw[1] || macAddrRaw[2] || macAddrRaw[3] || macAddrRaw[4] || macAddrRaw[5]) + m_interfaces.push_back(new CNetworkInterfaceLinux(this, interfaceName, macAddrRaw)); } free(line); fclose(fp); |