aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/network/windows/NetworkWin32.cpp5
-rw-r--r--xbmc/utils/SystemInfo.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/xbmc/network/windows/NetworkWin32.cpp b/xbmc/network/windows/NetworkWin32.cpp
index a2b292509b..f6489aa366 100644
--- a/xbmc/network/windows/NetworkWin32.cpp
+++ b/xbmc/network/windows/NetworkWin32.cpp
@@ -75,8 +75,9 @@ bool CNetworkInterfaceWin32::IsConnected()
CStdString CNetworkInterfaceWin32::GetMacAddress()
{
- CStdString result = "";
- result = CStdString((char*)m_adapter.Address);
+ CStdString result;
+ unsigned char* mAddr = m_adapter.Address;
+ result.Format("%02X:%02X:%02X:%02X:%02X:%02X", mAddr[0], mAddr[1], mAddr[2], mAddr[3], mAddr[4], mAddr[5]);
return result;
}
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index cbe22f1ba0..fca71837ff 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -88,7 +88,7 @@ CSysData::INTERNET_STATE CSysInfoJob::GetInternetState()
CStdString CSysInfoJob::GetMACAddress()
{
-#if defined(HAS_LINUX_NETWORK)
+#if defined(HAS_LINUX_NETWORK) || defined(HAS_WIN32_NETWORK)
CNetworkInterface* iface = g_application.getNetwork().GetFirstConnectedInterface();
if (iface)
return iface->GetMacAddress();