Changeset 73946 in vbox for trunk

Timestamp:

Aug 29, 2018 12:23:45 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472. Fix for r124671.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -214 +214 @@
     if (vboxGlobal().agressiveCaching())
     {
-        AssertReturn(!m_pSession, false);
+        AssertReturn(m_pSession, false);
         vboxGlobal().startMediumEnumeration(m_pSession->getMachineMedia());
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -2122 +2122 @@
 {
     CMediumVector media;
-    foreach (const CStorageController &controller, m_machine.GetStorageControllers())
+    foreach (const CStorageController &comController, m_machine.GetStorageControllers())
     {
         QString strAttData;
         /* Enumerate all the attachments: */
-        foreach (const CMediumAttachment &attachment, m_machine.GetMediumAttachmentsOfController(controller.GetName()))
+        foreach (const CMediumAttachment &comAttachment, m_machine.GetMediumAttachmentsOfController(comController.GetName()))
         {
             /* Skip unrelated attachments: */
-            if (attachment.GetType() != KDeviceType_HardDisk &&
-                attachment.GetType() != KDeviceType_Floppy &&
-                attachment.GetType() != KDeviceType_DVD)
+            if (comAttachment.GetType() != KDeviceType_HardDisk &&
+                comAttachment.GetType() != KDeviceType_Floppy &&
+                comAttachment.GetType() != KDeviceType_DVD)
                 continue;
-            if (attachment.GetIsEjected() || attachment.GetMedium().isNull())
+            if (comAttachment.GetIsEjected() || comAttachment.GetMedium().isNull())
                 continue;
-            media.append(attachment.GetMedium());
+            media.append(comAttachment.GetMedium());
         }
     }