Changeset 82956 in vbox for trunk

Timestamp:

Feb 3, 2020 1:18:00 PM (5 years ago)

Author:

vboxsync

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

135962

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Missed validation bits for r135945; Сheck item type before casting it to local one.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• chooser/UIChooserItemMachine.cpp (modified) (4 diffs)
• details/UIDetailsGroup.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -290 +290 @@
     /* And machine-item content to take into account: */
     int iTopLineWidth = m_iMinimumNameWidth;
-    if (!node()->toMachineNode()->cache()->toLocal()->snapshotName().isEmpty())
+    if (   node()->toMachineNode()->cache()->itemType() == UIVirtualMachineItem::ItemType_Local
+        && !node()->toMachineNode()->cache()->toLocal()->snapshotName().isEmpty())
         iTopLineWidth += (iMinorSpacing +
                           m_iMinimumSnapshotNameWidth);
@@ -701 +702 @@
     int iMinimumSnapshotNameWidth = 0;
     /* Is there any snapshot exists? */
-    if (!node()->toMachineNode()->cache()->toLocal()->snapshotName().isEmpty())
+    if (   node()->toMachineNode()->cache()->itemType() == UIVirtualMachineItem::ItemType_Local
+        && !node()->toMachineNode()->cache()->toLocal()->snapshotName().isEmpty())
     {
         QFontMetrics fm(m_snapshotNameFont, model()->paintDevice());
@@ -785 +787 @@
 void UIChooserItemMachine::updateVisibleSnapshotName()
 {
+    /* Make sure this is local machine item: */
+    if (node()->toMachineNode()->cache()->itemType() != UIVirtualMachineItem::ItemType_Local)
+        return;
+
     /* Prepare variables: */
     QPaintDevice *pPaintDevice = model()->paintDevice();
@@ -1088 +1094 @@
 
             /* Paint middle element: */
-            if (!node()->toMachineNode()->cache()->toLocal()->snapshotName().isEmpty())
+            if (   node()->toMachineNode()->cache()->itemType() == UIVirtualMachineItem::ItemType_Local
+                && !node()->toMachineNode()->cache()->toLocal()->snapshotName().isEmpty())
             {
                 /* Prepare variables: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp

@@ -78 +78 @@
 void UIDetailsGroup::buildGroup(const QList<UIVirtualMachineItem*> &machineItems)
 {
+    /* Filter out cloud VM items for now: */
+    QList<UIVirtualMachineItem*> filteredItems;
+    foreach (UIVirtualMachineItem *pItem, machineItems)
+        if (pItem->itemType() == UIVirtualMachineItem::ItemType_Local)
+            filteredItems << pItem;
+
     /* Remember passed machine-items: */
-    m_machineItems = machineItems;
+    m_machineItems = filteredItems;
 
     /* Cleanup superflous items: */