Changeset 84188 in vbox for trunk/src

Timestamp:

May 7, 2020 2:28:29 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Chooser pane: Couple of checks to make sure item is of local type.

Location:

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

Files:

• UIVirtualBoxManager.cpp (modified) (3 diffs)
• chooser/UIChooserItemMachine.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -805 +805 @@
     foreach (UIVirtualMachineItem *pItem, items)
     {
-        /* Get item state: */
+        /* But for local machine items only: */
+        AssertPtrReturnVoid(pItem);
+        if (pItem->itemType() != UIVirtualMachineItemType_Local)
+            continue;
+
+        /* Get machine item state: */
         const KMachineState enmState = pItem->machineState();
 
@@ -919 +924 @@
     {
         /* Check if current item could be saved: */
+        AssertPtrReturnVoid(pItem);
         if (!isActionEnabled(UIActionIndexST_M_Machine_M_Close_S_SaveState, QList<UIVirtualMachineItem*>() << pItem))
             continue;
@@ -931 +937 @@
         /* Get session machine: */
         CMachine comMachine = comSession.GetMachine();
+        /* Get machine item state: */
+        const KMachineState enmState = pItem->machineState();
         /* Pause VM first if necessary: */
-        if (pItem->machineState() != KMachineState_Paused)
+        if (enmState != KMachineState_Paused)
             comConsole.Pause();
         if (comConsole.isOk())

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

@@ -92 +92 @@
 bool UIChooserItemMachine::isLockedMachine() const
 {
-    const KMachineState enmState = cacheType() == UIVirtualMachineItemType_Local
-                                 ? cache()->machineState()
-                                 : KMachineState_Null;
-    return enmState != KMachineState_PoweredOff &&
-           enmState != KMachineState_Saved &&
-           enmState != KMachineState_Teleported &&
-           enmState != KMachineState_Aborted;
+    /* For local machines only, others always unlocked: */
+    if (cacheType() != UIVirtualMachineItemType_Local)
+        return false;
+
+    /* Acquire local machine state: */
+    const KMachineState enmState = cache()->machineState();
+    return    enmState != KMachineState_PoweredOff
+           && enmState != KMachineState_Saved
+           && enmState != KMachineState_Teleported
+           && enmState != KMachineState_Aborted;
 }