diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-07 06:16:59 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-07 06:16:59 (GMT) |
| commit | cbec6d9481bf8f55834eafac4eca53f85206b240 (patch) | |
| tree | 9875b3dd5a87c0274ee0d57f541f836598936f2b /src/network/kernel | |
| parent | be8b6047ccd43df1127beb4c602c58408ff9b612 (diff) | |
| parent | 939623b2bc8e441618ee1a1886cc656880bee62b (diff) | |
| download | Qt-cbec6d9481bf8f55834eafac4eca53f85206b240.zip Qt-cbec6d9481bf8f55834eafac4eca53f85206b240.tar.gz Qt-cbec6d9481bf8f55834eafac4eca53f85206b240.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp index 9540c18..de97629 100644 --- a/src/network/kernel/qnetworkinterface_win.cpp +++ b/src/network/kernel/qnetworkinterface_win.cpp @@ -173,14 +173,14 @@ static QList<QNetworkInterfacePrivate *> interfaceListingWinXP() interfaces << iface; iface->index = 0; - if (ptr->Length >= offsetof(IP_ADAPTER_ADDRESSES, Ipv6IfIndex)) + if (ptr->Length >= offsetof(IP_ADAPTER_ADDRESSES, Ipv6IfIndex) && ptr->Ipv6IfIndex != 0) iface->index = ptr->Ipv6IfIndex; else if (ptr->IfIndex != 0) iface->index = ptr->IfIndex; iface->flags = QNetworkInterface::CanBroadcast; - if (ptr->OperStatus == IfOperStatusUp) - iface->flags |= QNetworkInterface::IsUp | QNetworkInterface::IsRunning; + if (ptr->OperStatus == IfOperStatusUp) + iface->flags |= QNetworkInterface::IsUp | QNetworkInterface::IsRunning; if ((ptr->Flags & IP_ADAPTER_NO_MULTICAST) == 0) iface->flags |= QNetworkInterface::CanMulticast; |