Changeset 66721 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 28, 2017 2:38:13 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115123

Message:

FE/Qt: bugref:8847: Host Network Manager: Fixing IPv4/IPv6 column text in certain cases (s.a. r115088).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -86 +86 @@
     /* Compose item fields: */
     setText(Column_Name, m_interface.m_strName);
-    setText(Column_IPv4, QString("%1/%2").arg(m_interface.m_strAddress).arg(maskToCidr(m_interface.m_strMask)));
-    setText(Column_IPv6, !m_interface.m_fSupportedIPv6 ? QString() :
-                         QString("%1/%2").arg(m_interface.m_strAddress6).arg(maskToCidr(m_interface.m_strMaskLength6)));
+    setText(Column_IPv4, m_interface.m_strAddress.isEmpty() ? QString() :
+                         QString("%1/%2").arg(m_interface.m_strAddress).arg(maskToCidr(m_interface.m_strMask)));
+    setText(Column_IPv6, m_interface.m_strAddress6.isEmpty() || !m_interface.m_fSupportedIPv6 ? QString() :
+                         QString("%1/%2").arg(m_interface.m_strAddress6).arg(m_interface.m_strMaskLength6.toInt()));
     setText(Column_DHCP, UIHostNetworkManager::tr("Enable", "DHCP Server"));
     setCheckState(Column_DHCP, m_dhcpserver.m_fEnabled ? Qt::Checked : Qt::Unchecked);