Changeset 28671 in vbox

Timestamp:

Apr 23, 2010 5:54:49 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: addendum to r60484 (we should keep in sync for now)

File:

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

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -3126 +3126 @@
         QString info;
 
-        for (ulong slot = 0; slot < maxCount; ++ slot)
-        {
-            CNetworkAdapter adapter = machine.GetNetworkAdapter (slot);
-            QString ip;
-            ULONG64 timestamp;
-            RTTIMESPEC time;
+        for (ulong slot = 0, uEnabled = 0; slot < maxCount; ++ slot)
+        {
+            const CNetworkAdapter &adapter = machine.GetNetworkAdapter (slot);
             if (adapter.GetEnabled())
             {
+                QString strFlags;
+                QString strCount;
+                ULONG64 timestamp;
+                machine.GetGuestProperty("/VirtualBox/GuestInfo/Net/Count", strCount, timestamp, strFlags);
+                RTTIMESPEC time;
                 uint64_t u64Now = RTTimeSpecGetNano(RTTimeNow(&time));
-                QString flags;
-                machine.GetGuestProperty(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(slot),
-                                        ip, timestamp, flags);
+                QString strIP;
+                if (   u64Now - timestamp < UINT64_C(60000000000)
+                    && strCount.toInt() > 0)
+                    strIP = machine.GetGuestPropertyValue(QString("/VirtualBox/GuestInfo/Net/%1/V4/IP").arg(uEnabled));
                 info += tr ("<br><nobr><b>Adapter %1 (%2)</b>: %3 cable %4</nobr>", "Network adapters tooltip")
                     .arg (slot + 1)
                     .arg (vboxGlobal().toString (adapter.GetAttachmentType()))
-                    .arg (ip.isEmpty() || (u64Now - timestamp > UINT64_C(20000000000)) ? "" : "IP " + ip + ", ")
+                    .arg (strIP.isEmpty() ? "" : "IP " + strIP + ", ")
                     .arg (adapter.GetCableConnected() ?
                           tr ("connected", "Network adapters tooltip") :
                           tr ("disconnected", "Network adapters tooltip"));
+                uEnabled++;
             }
         }